Cleaning up some templates