getting rid of more tables