diff --git a/drivers/storage/class/classpnp/class.c b/drivers/storage/class/classpnp/class.c
index 27f84afd30a..35b2ed3aa78 100644
--- a/drivers/storage/class/classpnp/class.c
+++ b/drivers/storage/class/classpnp/class.c
@@ -949,6 +949,7 @@ ClassDispatchPnp(
 
             case IRP_MN_START_DEVICE: {
 
+__debugbreak();
                 //
                 // if this is sent to the FDO we should forward it down the
                 // attachment chain before we start the FDO.
diff --git a/drivers/storage/class/disk/disk.h b/drivers/storage/class/disk/disk.h
index d46bafe8ca4..5c232f340b3 100644
--- a/drivers/storage/class/disk/disk.h
+++ b/drivers/storage/class/disk/disk.h
@@ -184,11 +184,13 @@ typedef enum _DISK_USER_WRITE_CACHE_SETTING
 
 typedef struct _DISK_DATA {
 
+#if 0
     //
     // This field is the ordinal of a partition as it appears on a disk.
     //
 
     ULONG PartitionOrdinal;
+#endif
 
     //
     // How has this disk been partitioned? Either EFI or MBR.
@@ -212,6 +214,7 @@ typedef struct _DISK_DATA {
 
             ULONG MbrCheckSum;
 
+#if 0
             //
             // Number of hidden sectors for BPB.
             //
@@ -243,6 +246,7 @@ typedef struct _DISK_DATA {
             //
 
             BOOLEAN BootIndicator;
+#endif
 
         } Mbr;
 
@@ -254,6 +258,7 @@ typedef struct _DISK_DATA {
 
             GUID DiskId;
 
+#if 0
             //
             // Partition type of this device object.
             //
@@ -277,6 +282,7 @@ typedef struct _DISK_DATA {
             //
 
             WCHAR PartitionName[36];
+#endif
 
         } Efi;
 
diff --git a/drivers/storage/class/disk/geometry.c b/drivers/storage/class/disk/geometry.c
index 91eab0e7f8e..97e7ed973a5 100644
--- a/drivers/storage/class/disk/geometry.c
+++ b/drivers/storage/class/disk/geometry.c
@@ -1649,6 +1649,7 @@ Return Value:
 
     PAGED_CODE();
 
+__debugbreak();
     Status = IoReadDiskSignature (Fdo,
                                   fdoExtension->DiskGeometry.BytesPerSector,
                                   &Signature);
diff --git a/drivers/storage/class/disk/pnp.c b/drivers/storage/class/disk/pnp.c
index f124d96be85..5fd460b1c15 100644
--- a/drivers/storage/class/disk/pnp.c
+++ b/drivers/storage/class/disk/pnp.c
@@ -234,6 +234,7 @@ Return Value:
 
     PAGED_CODE();
 
+__debugbreak();
     //
     // Build the lookaside list for srb's for the physical disk. Should only
     // need a couple.  If this fails then we don't have an emergency SRB so
@@ -448,6 +449,7 @@ Return Value:
 
     if(!TEST_FLAG(Fdo->Characteristics, FILE_REMOVABLE_MEDIA)) {
 
+__debugbreak();
         DiskReadSignature(Fdo);
         DiskReadDriveCapacity(Fdo);