HDFS-5642: comment clean-up