Cleanup of comments
p4#: 20504