diff --git a/daemon/nfs41_compound.c b/daemon/nfs41_compound.c
index 20a32ca..73751cd 100644
--- a/daemon/nfs41_compound.c
+++ b/daemon/nfs41_compound.c
@@ -210,7 +210,7 @@ static int recover_client_state(
     return status;
 }
 
-static bool_t do_recovery(nfs_argop4 *argop, nfs41_session *session)
+static bool_t recover_stateid(nfs_argop4 *argop, nfs41_session *session)
 {
     stateid_arg *stateid = NULL;
     stateid4 *source = NULL;
@@ -398,7 +398,7 @@ restart_recovery:
         if (!try_recovery)
             goto out;
 
-        if (do_recovery(&compound->args.argarray[compound->res.resarray_count-1], 
+        if (recover_stateid(&compound->args.argarray[compound->res.resarray_count-1], 
                         session)) 
             goto retry;
         goto out;
diff --git a/daemon/setattr.c b/daemon/setattr.c
index 7803ceb..f476857 100644
--- a/daemon/setattr.c
+++ b/daemon/setattr.c
@@ -481,12 +481,6 @@ static int handle_setattr(nfs41_upcall *upcall)
         status = ERROR_NOT_SUPPORTED;
         break;
     }
-
-    switch (args->set_class) {
-    case FileAllocationInformation:
-    case FileEndOfFileInformation:
-        client_state_remove(state);
-    }
 out:
     free(args->buf);
     return status;