Delete legacy workarround for templates