remove some unneeded enveloping tables