Fix the migration for our current state

We need to remove some modules from the migration and enforce some new
constraints