Full code review

Full code review
Removed dependency on HDFS.