Cleanup templates.

Template housekeeping