Cleanup templates.
Merge pull request #900 from glogiotatidis/templates

Cleanup templates.