Removing nfs dependency, WIP.