Removed old hack from TemplateParser