HDFS-6326: clean up unneeded code