cleaning up models, migrations and UI