Remove requirement on NFS