core migration left overs which have been fixed during cc migration.
fixed problems introduced by broken migration :-(