Feature/hdfs cleanup