Clean up some more troublesome comments