Get rid of some unnecessary comments