Cleanup, generate migrations