Merging migrations + some fixes.
Removing useless migrations.