diff --git a/cryptfs.c b/cryptfs.c
index bbd952b..7d2b872 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1451,10 +1451,10 @@
         if (kill) {
             if (i == (WAIT_UNMOUNT_COUNT - 3)) {
                 SLOGW("sending SIGHUP to processes with open files\n");
-                vold_killProcessesWithOpenFiles(mountpoint, 1);
+                vold_killProcessesWithOpenFiles(mountpoint, SIGTERM);
             } else if (i == (WAIT_UNMOUNT_COUNT - 2)) {
                 SLOGW("sending SIGKILL to processes with open files\n");
-                vold_killProcessesWithOpenFiles(mountpoint, 2);
+                vold_killProcessesWithOpenFiles(mountpoint, SIGKILL);
             }
         }
 
@@ -3062,6 +3062,9 @@
 
     property_get("ro.crypto.fuse_sdcard", fuse_sdcard, "");
     if (!strcmp(fuse_sdcard, "true")) {
+        // STOPSHIP: UNMOUNT ALL STORAGE BEFORE REACHING HERE, SINCE VOLD NOW MANAGES FUSE
+        // "ro.crypto.fuse_sdcard" is now deprecated
+
         /* This is a device using the fuse layer to emulate the sdcard semantics
          * on top of the userdata partition.  vold does not manage it, it is managed
          * by the sdcard service.  The sdcard service was killed by the property trigger