diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd b/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd
deleted file mode 100644
index 160f4673d7..0000000000
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MbdHeader>
-    <BaseName>DiskIoPartition</BaseName>
-    <Guid>854E153A-8AC8-40f4-A5A9-4C51F18CFB1B</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-12 17:09</Created>
-    <Modified>2006-03-19 15:19</Modified>
-  </MbdHeader>
-  <Libraries>
-    <Library>UefiBootServicesTableLib</Library>
-    <Library>BaseLib</Library>
-    <Library>UefiMemoryLib</Library>
-    <Library>UefiLib</Library>
-    <Library>UefiDriverEntryPoint</Library>
-    <Library>UefiDriverModelLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
-    <Library>PeiDxeDebugLibReportStatusCode</Library>    
-    <Library>DxeMemoryAllocationLib</Library>
-    <Library>UefiDevicePathLib</Library>
-  </Libraries>
-</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.msa b/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.msa
deleted file mode 100644
index 62e802227d..0000000000
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.msa
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MsaHeader>
-    <BaseName>DiskIoPartition</BaseName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>854E153A-8AC8-40f4-A5A9-4C51F18CFB1B</Guid>
-    <Version>0</Version>
-    <Abstract>Component description file for DiskIo module.</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-12 17:09</Created>
-    <Updated>2006-03-19 15:19</Updated>
-    <Specification>0</Specification>
-  </MsaHeader>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>../../DiskIo/Dxe/diskio.c</Filename>
-    <Filename>../../DiskIo/Dxe/diskio.h</Filename>
-    <Filename>../../DiskIo/Dxe/ComponentName.c</Filename>
-    <Filename>../../Partition/Dxe/Partition.h</Filename>
-    <Filename>../../Partition/Dxe/ElTorito.h</Filename>
-    <Filename>../../Partition/Dxe/Gpt.h</Filename>
-    <Filename>../../Partition/Dxe/Mbr.h</Filename>
-    <Filename>../../Partition/Dxe/Partition.c</Filename>
-    <Filename>../../Partition/Dxe/ElTorito.c</Filename>
-    <Filename>../../Partition/Dxe/Gpt.c</Filename>
-    <Filename>../../Partition/Dxe/Mbr.c</Filename>
-    <Filename>../../Partition/Dxe/ComponentName.c</Filename>
-  </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-  </Includes>
-  <Protocols>
-    <Protocol Usage="TO_START">BlockIo</Protocol>
-    <Protocol Usage="TO_START">DiskIo</Protocol>
-    <Protocol Usage="TO_START">DevicePath</Protocol>
-  </Protocols>
-  <Guids>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>PartTypeSystemPart</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>PartTypeUnused</C_Name>
-    </GuidEntry>
-  </Guids>
-  <Externs>
-    <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
-    </Extern>
-    <Extern>
-      <DriverBinding>gPartitionDriverBinding</DriverBinding>
-      <ComponentName>gPartitionComponentName</ComponentName>
-    </Extern>
-    <Extern>
-      <DriverBinding>gDiskIoDriverBinding</DriverBinding>
-      <ComponentName>gDiskIoComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/build.xml b/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/build.xml
deleted file mode 100644
index 5148719684..0000000000
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
-All rights reserved. This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at  
-http://opensource.org/licenses/bsd-license.php 
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
-<project basedir="." default="DiskIoPartition"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-   <property environment="env"/>
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
-   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
-   <property name="MODULE_RELATIVE_PATH" value="Universal/Disk/DiskIoPartition/Dxe"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DiskIoPartition">
-      <GenBuild baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}/DiskIoPartition.mbd" msaFilename="${MODULE_DIR}/DiskIoPartition.msa"/>
-   </target>
-   <target depends="DiskIoPartition_clean" name="clean"/>
-   <target depends="DiskIoPartition_cleanall" name="cleanall"/>
-   <target name="DiskIoPartition_clean">
-      <OutputDirSetup baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}/DiskIoPartition.mbd" msaFilename="${MODULE_DIR}/DiskIoPartition.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DiskIoPartition_cleanall">
-      <OutputDirSetup baseName="DiskIoPartition" mbdFilename="${MODULE_DIR}/DiskIoPartition.mbd" msaFilename="${MODULE_DIR}/DiskIoPartition.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DiskIoPartition_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DiskIoPartition*"/>
-      </delete>
-   </target>
-</project>