Old CMS mapping code commented