Added upgradestep: which cleanup the mixed-up old mappings.