Merge "Remove older migration code."