remove from the template too