Clean up Templater