remove unused tables
Merge branch 'remove_unused_tables'