HDFS-5673: clean-up