Cleans up migrations and fixes user model (missing end)