diff --git a/drivers/nvme/command.inc b/drivers/nvme/command.inc
index e40c264..48f93b1 100644
--- a/drivers/nvme/command.inc
+++ b/drivers/nvme/command.inc
@@ -131,7 +131,6 @@ proc set_features stdcall, pci:dword, prp1:dword, fid:byte, cdw11:dword
 	mov 	eax, [prp1]
 	mov 	dword [esp + SQ_ENTRY.prp1], eax
 	movzx 	eax, [fid]
-	;or 	eax, 1 shl 31 ; CDW10.SV
 	mov 	dword [esp + SQ_ENTRY.cdw10], eax
 	mov 	eax, [cdw11]
 	mov 	dword [esp + SQ_ENTRY.cdw11], eax
diff --git a/drivers/nvme/nvme.asm b/drivers/nvme/nvme.asm
index c5ae810..1571602 100644
--- a/drivers/nvme/nvme.asm
+++ b/drivers/nvme/nvme.asm
@@ -463,7 +463,6 @@ proc nvme_readwrite stdcall, ns:dword, buf:dword, start_sector:qword, numsectors
 
 	mov 	eax, [numsectors_ptr]
 	mov 	eax, dword [eax]
-	DEBUGF  DBG_INFO, "buf: %x, start_sector: %u:%u, numsectors: %u\n", [buf], [start_sector + 4], [start_sector], eax
 	mov 	dword [ebx + 4], 0 ; PRP2 entry (0 by default)
 	mov 	dword [ebx + 8], edx ; command type (read or write)
 	mov 	dword [ebx + 12], eax ; save original numsectors value
@@ -479,7 +478,6 @@ proc nvme_readwrite stdcall, ns:dword, buf:dword, start_sector:qword, numsectors
 	test 	eax, eax
 	jz 	.fail
 
-	DEBUGF  DBG_INFO, "PRP1: %x, PRP2: %x\n", [ebx], [ebx + 4]
 	mov 	eax, dword [start_sector]
 
 	; According to the NVMe specification, the NLB field in the I/O read and write
@@ -1136,7 +1134,6 @@ proc cqyhdbl_write stdcall, pci:dword, y:dword, cqh:dword
 	mov 	edi, dword [esi + pcidev.queue_entries]
 	lea 	edi, dword [edi + ecx]
 	mov 	eax, [cqh]
-	DEBUGF  DBG_INFO, "nvme%u: Writing to CQ%u doorbell register 0x%x: %u\n", [esi + pcidev.num], [y], dx, ax
 	mov 	esi, dword [esi + pcidev.io_addr]
 	mov 	word [esi + edx], ax ; Write to CQyHDBL
 	mov 	word [edi + NVM_QUEUE_ENTRY.head], ax
@@ -1194,7 +1191,6 @@ proc sqytdbl_write stdcall, pci:dword, y:word, cmd:dword
 	shl 	edx, cl
 	imul 	edx, ebx
 	add 	edx, 0x1000
-	DEBUGF  DBG_INFO, "nvme%u: Writing to SQ%u doorbell register 0x%x: %u\n", [esi + pcidev.num], [y], dx, ax
 	mov 	word [edi + NVM_QUEUE_ENTRY.tail], ax
 	mov 	esi, dword [esi + pcidev.io_addr]
 	mov 	word [esi + edx], ax