Removing TemplateHint code