Removing dependency on hadoop