Removed unused templates

Leftovers of previous design.
Merge branch 'master' of https://github.com/shrivara/Athena