diff --git a/viostor/viostor_no_msi.inx b/viostor/viostor_no_msi.inx
deleted file mode 100755
index a36f0a096..000000000
--- a/viostor/viostor_no_msi.inx
+++ /dev/null
@@ -1,107 +0,0 @@
-;/*++
-;
-;INX_COPYRIGHT_1
-;INX_COPYRIGHT_2
-;
-;Module Name:
-;    viostor.inf
-;
-;Abstract:
-;
-;Installation Notes:
-;    Step by step driver installation wiki:
-;        https://github.com/virtio-win/kvm-guest-drivers-windows/wiki/Driver-installation
-;
-;--*/
-
-[Version]
-Signature="$Windows NT$"
-Class=SCSIAdapter
-ClassGUID={4D36E97B-E325-11CE-BFC1-08002BE10318}
-Provider=%VENDOR%
-DriverVer=01/01/2008,0.0.0.1 ; this line will be replaced with stampinf
-CatalogFile=viostor.cat
-DriverPackageType = PlugAndPlay
-DriverPackageDisplayName = %VioStorScsi.DeviceDesc%
-
-;
-; Source file information
-;
-
-[SourceDisksNames]
-1 = %DiskId1%,,,""
-
-[SourceDisksFiles]
-viostor.sys = 1,,
-
-[ControlFlags]
-;ExcludeFromSelect = *
-
-[DestinationDirs]
-DefaultDestDir = 10
-viostor_Files_Driver = 12
-
-;
-; Driver information
-;
-
-[Manufacturer]
-%VENDOR%   = VioStor,NT$ARCH$
-
-[VioStor.NT$ARCH$]
-%VioStorScsi.DeviceDesc% = scsi_inst, PCI\VEN_1AF4&DEV_1001&SUBSYS_0002_INX_SUBSYS_VENDOR_ID&REV_00, PCI\VEN_1AF4&DEV_1001
-%VioStorScsi.DeviceDesc% = scsi_inst, PCI\VEN_1AF4&DEV_1042&SUBSYS_1100_INX_SUBSYS_VENDOR_ID&REV_01, PCI\VEN_1AF4&DEV_1042
-
-;
-; General installation section
-;
-
-[viostor_Files_Driver]
-viostor.sys,,,2
-
-[scsi_inst]
-CopyFiles=viostor_Files_Driver
-
-;
-; Service Installation
-;
-
-[scsi_inst.Services]
-AddService = viostor, 0x00000002 , scsi_Service_Inst, scsi_EventLog_Inst
-
-[scsi_Service_Inst]
-ServiceType    = %SERVICE_KERNEL_DRIVER%
-StartType      = %SERVICE_BOOT_START%
-ErrorControl   = %SERVICE_ERROR_NORMAL%
-ServiceBinary  = %12%\viostor.sys
-LoadOrderGroup = SCSI miniport
-AddReg         = pnpsafe_pci_addreg
-
-[scsi_EventLog_Inst]
-AddReg = scsi_EventLog_AddReg
-
-[scsi_EventLog_AddReg]
-HKR,,EventMessageFile,%REG_EXPAND_SZ%,"%%SystemRoot%%\System32\IoLogMsg.dll"
-HKR,,TypesSupported,%REG_DWORD%,7
-
-[pnpsafe_pci_addreg]
-HKR, "Parameters\PnpInterface", "5", %REG_DWORD%, 0x00000001
-HKR, "Parameters", "BusType", %REG_DWORD%, 0x00000001
-
-[Strings]
-;
-; Localizable Strings
-;
-VENDOR = "INX_COMPANY"
-diskId1 = "INX_PREFIX_VENDORVirtIO SCSI controller Installation Disk"
-VioStorScsi.DeviceDesc = "INX_PREFIX_VENDORVirtIO SCSI controller"
-
-;
-; Non-Localizable Strings
-;
-
-REG_EXPAND_SZ  = 0x00020000
-REG_DWORD      = 0x00010001
-SERVICE_KERNEL_DRIVER  = 1
-SERVICE_BOOT_START     = 0
-SERVICE_ERROR_NORMAL   = 1
diff --git a/viostor/virtio_stor.c b/viostor/virtio_stor.c
index b20ca6e6f..3c93d14ae 100755
--- a/viostor/virtio_stor.c
+++ b/viostor/virtio_stor.c
@@ -180,12 +180,10 @@ CompleteDPC(
     IN ULONG  MessageID
     );
 
-#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
 UCHAR FirmwareRequest(
     IN PVOID DeviceExtension,
     IN PSRB_TYPE Srb
     );
-#endif
 
 VOID
 ReportDeviceIdentifier(
@@ -576,9 +574,7 @@ VirtIoFindAdapter(
         RhelDbgPrint(TRACE_LEVEL_FATAL, " pmsg_affinity = %p Status = %lu\n",adaptExt->pmsg_affinity, Status);
     }
 
-#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
     adaptExt->fw_ver = '0';
-#endif
     return SP_RETURN_FOUND;
 }
 
@@ -631,11 +627,9 @@ RhelSetGuestFeatures(
         }
     }
 
-#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
     if (CHECKBIT(adaptExt->features, VIRTIO_F_ACCESS_PLATFORM)) {
         guestFeatures |= (1ULL << VIRTIO_F_ACCESS_PLATFORM);
     }
-#endif
 
     if (CHECKBIT(adaptExt->features, VIRTIO_F_ANY_LAYOUT)) {
         guestFeatures |= (1ULL << VIRTIO_F_ANY_LAYOUT);
@@ -917,12 +911,10 @@ VirtIoStartIo(
             PSRB_IO_CONTROL srbControl = (PSRB_IO_CONTROL)srbDataBuffer;
             UCHAR srbStatus = SRB_STATUS_INVALID_REQUEST;
             switch (srbControl->ControlCode) {
-#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
             case IOCTL_SCSI_MINIPORT_FIRMWARE:
                 srbStatus = FirmwareRequest(DeviceExtension, (PSRB_TYPE)Srb);
                 RhelDbgPrint(TRACE_LEVEL_INFORMATION, " <--> IOCTL_SCSI_MINIPORT_FIRMWARE\n");
                 break;
-#endif
             default:
                 RhelDbgPrint(TRACE_LEVEL_INFORMATION, " <--> Unsupport control code 0x%x\n", srbControl->ControlCode);
                 break;
@@ -2159,7 +2151,6 @@ VioStorPoolAlloc(
     return NULL;
 }
 
-#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
 UCHAR FirmwareRequest(
     IN PVOID DeviceExtension,
     IN PSRB_TYPE Srb
@@ -2270,4 +2261,3 @@ UCHAR FirmwareRequest(
 
     return srbStatus;
 }
-#endif
diff --git a/viostor/virtio_stor.h b/viostor/virtio_stor.h
index c19d238a3..464b5b246 100755
--- a/viostor/virtio_stor.h
+++ b/viostor/virtio_stor.h
@@ -93,10 +93,6 @@ typedef struct VirtIOBufferDescriptor VIO_SG, *PVIO_SG;
 
 #define VIOBLK_POOL_TAG        'BoiV'
 
-#ifndef NTDDI_WINTHRESHOLD
-#define NTDDI_WINTHRESHOLD                  0x0A000000  /* ABRACADABRA_THRESHOLD */
-#endif
-
 #pragma pack(1)
 typedef struct virtio_blk_config {
     /* The capacity (in 512-byte sectors). */
@@ -250,9 +246,7 @@ typedef struct _ADAPTER_EXTENSION {
     blk_discard_write_zeroes blk_discard[16];
     REQUEST_LIST          processing_srbs[MAX_CPU];
     BOOLEAN               reset_in_progress;
-#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
     ULONGLONG             fw_ver;
-#endif
 #ifdef DBG
     LONG                  srb_cnt;
     LONG                  inqueue_cnt;