Removed ClassMap / TemplateMap