delete some unused templates
Merge pull request #5840 from guardian/code-cleanup

Code cleanup