Update all models, remove extra models
Fix migration files and remove unneeded migration