diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index c318283e28..eb48bd19fe 100644
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -45,7 +45,6 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" />
       
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" />
@@ -102,7 +101,6 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Partition" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="English" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIoPartition" />
       
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SecurityStub" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeMain" />
@@ -162,7 +160,6 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Partition" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="English" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIoPartition" />
       
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SecurityStub" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeMain" />
@@ -224,7 +221,6 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Partition" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="English" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIoPartition" />
       
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SecurityStub" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeMain" />
@@ -946,75 +942,7 @@
             <Value>0xAF</Value>
           </PcdData>
         </PcdBuildDefinition>
-      </ModuleSA>      
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x0f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>      
+      </ModuleSA>  
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
@@ -4244,75 +4172,7 @@
             <Value>0xAF</Value>
           </PcdData>
         </PcdBuildDefinition>
-      </ModuleSA>      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x0f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>      
+      </ModuleSA> 
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SecurityStub" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
@@ -7544,75 +7404,7 @@
             <Value>0xAF</Value>
           </PcdData>
         </PcdBuildDefinition>
-      </ModuleSA>      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x0f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>      
+      </ModuleSA>
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SecurityStub" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
@@ -10844,75 +10636,7 @@
             <Value>0xAF</Value>
           </PcdData>
         </PcdBuildDefinition>
-      </ModuleSA>      
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x0f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>      
+      </ModuleSA>    
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SecurityStub" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 69f3b76c1c..c0f6dbc66d 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -46,7 +46,6 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMain" />
@@ -751,75 +750,7 @@
             <Value>0xAF</Value>
           </PcdData>
         </PcdBuildDefinition>
-      </ModuleSA>      
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x0f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>      
+      </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 9c722a8838..18d87045a6 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -255,9 +255,6 @@
     <MsaFile>
       <Filename>Universal/Disk/DiskIo/Dxe/DiskIo.msa</Filename>
     </MsaFile>
-    <MsaFile>
-      <Filename>Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.msa</Filename>
-    </MsaFile>
     <MsaFile>
       <Filename>Universal/Disk/Partition/Dxe/Partition.msa</Filename>
     </MsaFile>
diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 3965c5064a..3ec3a12584 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -108,7 +108,7 @@
       <Filename>Pei/FlashMap/FlashMap.msa</Filename>
     </MsaFile>
     <MsaFile>
-      <Filename>Pei/MonoStatusCode/Nt32/MonoStatusCode.msa</Filename>
+      <Filename>Pei/MonoStatusCode/MonoStatusCode.msa</Filename>
     </MsaFile>
     <MsaFile>
       <Filename>Pei/WinNtStuff/WinNtStuff.msa</Filename>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 5fb363ccfd..ed7a5e6d76 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -186,7 +186,6 @@
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub"/>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr"/>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition"/>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc"/>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest"/>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase"/>
@@ -2943,74 +2942,6 @@
           </PcdData>
         </PcdBuildDefinition>
       </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">