Remove old templateName code, templates are now inlined