HDFS-2856: minor cleanup