Clean up templates