HDFS-4249: remove unused import
HDFS-4249: renamings and cleanups