Cleanup
Rearrange migrations for deployment