Simplify templating - the redundant cls.templates weren't being used