diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci.c b/src/add-ons/kernel/busses/scsi/ahci/ahci.c
index 38a93494ef..51494bea96 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci.c
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci.c
@@ -83,19 +83,11 @@ ahci_supports_device(device_node_handle parent, bool *_noConnection)
 			PCI_DEVICE_DEVICE_ID_ITEM, &deviceID, false) != B_OK)
 		return B_ERROR;
 
-#if 1
 	if (strcmp(bus, "pci") || baseClass != PCI_mass_storage
 		|| subClass != PCI_sata || classAPI != PCI_sata_ahci) {
 		free(bus);
 		return 0.0f;
 	}
-#else
-	if (strcmp(bus, "pci") || baseClass != PCI_mass_storage
-		|| subClass != PCI_ide) {
-		free(bus);
-		return 0.0;
-	}
-#endif
 
 	TRACE("controller found! vendor 0x%04x, device 0x%04x\n",
 		vendorID, deviceID);
diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
index f60ad4e15d..75cfa7cdbb 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
@@ -235,16 +235,10 @@ AHCIController::ResetController()
 	uint32 saveCaps = fRegs->cap & (CAP_SMPS | CAP_SSS | CAP_SPM | CAP_EMS | CAP_SXS);
 	uint32 savePI = fRegs->pi;
 	
-#if 1
 	fRegs->ghc |= GHC_HR;
 	FlushPostedWrites();
 	if (wait_until_clear(&fRegs->ghc, GHC_HR, 1000000) < B_OK)
 		return B_TIMED_OUT;
-#else
-	fRegs->ghc &= ~GHC_AE;
-	fRegs->is = 0xffffffff;
-	FlushPostedWrites();
-#endif
 
 	fRegs->ghc |= GHC_AE;
 	FlushPostedWrites();