*8749* PKPTemplateManager cleanup