Remove dependency on hadoop cluster