REMOVE HADOOP STUFF
Fix trailing space handling
WIP