HDFS-5614: cleanups