Clean up of tables and columns we aren't using