TemplateGenerators: DeprecatedGenerator decoupled from Generator
cleanup