Remove some unnecessary comments, and some more-necessary ones