Remove migration and clean up whitespace