Clean up the templates