HDFS-6326: minor cleanup