Clean up migrations and renamed model