Get rid of more tables.