Template cleanup.
Merge pull request #513 from glogiotatidis/cleanup

Template cleanup.