Clean up mis-migration