HDFS-6099: cleanup