Cleanup consolidated migration data
Fix migrating from existing data