Templates cleanup