Templates cleanup [MRB]