Remove unused tables
Remove unused models
Add timestamps as necessary
Merge branch 'db-cleanup'