removing nfs refs and structure changes (not finished)