And drop a few more lines of NFS stuff...