Cleaning up some migrations and model stuff
Cleaning up more model stuff