Clean-up templates