Remove TemplateSection and TemplateBuilder classes