clean up some templates