New migration and code cleanup.