diff --git a/inc/winfsp/fsctl.h b/inc/winfsp/fsctl.h
index aed66a60..c48e34b4 100644
--- a/inc/winfsp/fsctl.h
+++ b/inc/winfsp/fsctl.h
@@ -46,6 +46,7 @@ enum
 {
     FspFsctlTransactUnknownKind = 0,
     FspFsctlTransactCreateKind,
+    FspFsctlTransactCleanupKind,
     FspFsctlTransactCloseKind,
     FspFsctlTransactReadKind,
     FspFsctlTransactWriteKind,
@@ -61,7 +62,6 @@ enum
     FspFsctlTransactDeviceControlKind,
     FspFsctlTransactShutdownKind,
     FspFsctlTransactLockControlKind,
-    FspFsctlTransactCleanupKind,
     FspFsctlTransactQuerySecurityKind,
     FspFsctlTransactSetSecurityKind,
     FspFsctlTransactKindCount,
diff --git a/src/sys/create.c b/src/sys/create.c
index 39b77124..512426df 100644
--- a/src/sys/create.c
+++ b/src/sys/create.c
@@ -288,9 +288,9 @@ static NTSTATUS FspFsvolCreate(
 NTSTATUS FspFsvolCreatePrepare(
     PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request)
 {
-    FSP_ENTER_IOP(PAGED_CODE());
+    PAGED_CODE();
 
-    FSP_LEAVE_IOP();
+    return STATUS_SUCCESS;
 }
 
 VOID FspFsvolCreateComplete(
diff --git a/src/sys/driver.h b/src/sys/driver.h
index bb7b15d7..01bac882 100644
--- a/src/sys/driver.h
+++ b/src/sys/driver.h
@@ -135,12 +135,6 @@ extern __declspec(selectany) int bpglobal = 1;
             FspIopCompleteIrpEx(Irp, Result, fsp_device_release);\
     );                                  \
     return Result
-#define FSP_ENTER_IOP(...)              \
-    NTSTATUS Result = STATUS_SUCCESS;   \
-    PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); (VOID)IrpSp;\
-    FSP_ENTER_NOCRIT_(__VA_ARGS__)
-#define FSP_LEAVE_IOP()                 \
-    FSP_LEAVE_NOCRIT_(); return Result
 #define FSP_ENTER_IOC(...)              \
     NTSTATUS Result = STATUS_SUCCESS;   \
     PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); (VOID)IrpSp;\