Day1 template cleaning update