Removed NFS dependency