We should get rid of unused templates

Otherwise we run the risk of having updates going into the wrong place
Merge pull request #933 from mhaskel/remove_unused_template

We should get rid of unused templates