More migration cleanup.