Cleaning up and re-factoring migrations. <Jaideep>
Fixing merge conflicts. <Jaideep>