Cleanup and add migrations