Template clean ups