cleaning up some templates