Remove unused templates
Merge pull request #1555 from emth/unused-templates

Remove unused templates