Clean up a ton and start on migration command