Obsoleted by new schema and new build tools.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@821 6f19259b-4bc3-4df7-8a09-765794883524
author: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> 2006-07-07 09:28:33 +0000
committer: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> 2006-07-07 09:28:33 +0000
commit: 44050d53afe3a38812977a3e8f5f2860237a3690 (patch)
tree: 0138fcdbb0d3082353dd090eca504824566a6179 /EdkModulePkg/Library
parent: f46d7c213b49f97e68d6339aa9df3f70b15d9b59 (diff)
download: edk2-platforms-44050d53afe3a38812977a3e8f5f2860237a3690.tar.xz
56 files changed, 0 insertions, 2140 deletions
diff --git a/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.mbd b/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.mbd
deleted file mode 100644
index 0cbb341dd7..0000000000
--- a/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>BaseCustomDecompressLibNull</BaseName>
-    <Guid>e5566134-c75e-4ace-bad1-e23a3b335e30</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:18</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/BaseCustomDecompressLibNull/build.xml b/EdkModulePkg/Library/BaseCustomDecompressLibNull/build.xml
deleted file mode 100644
index 30ee33c56a..0000000000
--- a/EdkModulePkg/Library/BaseCustomDecompressLibNull/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="BaseCustomDecompressLibNull"><!--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="Library/BaseCustomDecompressLibNull"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="BaseCustomDecompressLibNull">
-      <GenBuild baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.msa"/>
-   </target>
-   <target depends="BaseCustomDecompressLibNull_clean" name="clean"/>
-   <target depends="BaseCustomDecompressLibNull_cleanall" name="cleanall"/>
-   <target name="BaseCustomDecompressLibNull_clean">
-      <OutputDirSetup baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="BaseCustomDecompressLibNull_cleanall">
-      <OutputDirSetup baseName="BaseCustomDecompressLibNull" mbdFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.mbd" msaFilename="${MODULE_DIR}/BaseCustomDecompressLibNull.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/BaseCustomDecompressLibNull_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**BaseCustomDecompressLibNull*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/BaseUefiTianoDecompressLib/BaseUefiTianoDecompressLib.mbd b/EdkModulePkg/Library/BaseUefiTianoDecompressLib/BaseUefiTianoDecompressLib.mbd
deleted file mode 100644
index 684d8e635d..0000000000
--- a/EdkModulePkg/Library/BaseUefiTianoDecompressLib/BaseUefiTianoDecompressLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>BaseUefiTianoDecompressLib</BaseName>
-    <Guid>d774c4d9-c121-4da3-a5e2-0f317e3c630c</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:18</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/BaseUefiTianoDecompressLib/build.xml b/EdkModulePkg/Library/BaseUefiTianoDecompressLib/build.xml
deleted file mode 100644
index 42b0263471..0000000000
--- a/EdkModulePkg/Library/BaseUefiTianoDecompressLib/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="BaseUefiTianoDecompressLib"><!--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="Library/BaseUefiTianoDecompressLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="BaseUefiTianoDecompressLib">
-      <GenBuild baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.msa"/>
-   </target>
-   <target depends="BaseUefiTianoDecompressLib_clean" name="clean"/>
-   <target depends="BaseUefiTianoDecompressLib_cleanall" name="cleanall"/>
-   <target name="BaseUefiTianoDecompressLib_clean">
-      <OutputDirSetup baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="BaseUefiTianoDecompressLib_cleanall">
-      <OutputDirSetup baseName="BaseUefiTianoDecompressLib" mbdFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.mbd" msaFilename="${MODULE_DIR}/BaseUefiTianoDecompressLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/BaseUefiTianoDecompressLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**BaseUefiTianoDecompressLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.mbd b/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.mbd
deleted file mode 100644
index f183e5aa15..0000000000
--- a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>DxeCoreCustomDecompressLibFromHob</BaseName>
-    <Guid>942e0182-3e1d-47f9-92dc-4939d1a0ba00</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:07</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/build.xml b/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/build.xml
deleted file mode 100644
index c18b27fa71..0000000000
--- a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/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="DxeCoreCustomDecompressLibFromHob"><!--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="Library/DxeCoreCustomDecompressLibFromHob"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DxeCoreCustomDecompressLibFromHob">
-      <GenBuild baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.msa"/>
-   </target>
-   <target depends="DxeCoreCustomDecompressLibFromHob_clean" name="clean"/>
-   <target depends="DxeCoreCustomDecompressLibFromHob_cleanall" name="cleanall"/>
-   <target name="DxeCoreCustomDecompressLibFromHob_clean">
-      <OutputDirSetup baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DxeCoreCustomDecompressLibFromHob_cleanall">
-      <OutputDirSetup baseName="DxeCoreCustomDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreCustomDecompressLibFromHob.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreCustomDecompressLibFromHob_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DxeCoreCustomDecompressLibFromHob*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.mbd b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.mbd
deleted file mode 100644
index a8f235f65b..0000000000
--- a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.mbd
+++ /dev/null
@@ -1,29 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>DxeCorePerformanceLib</BaseName>
-    <Guid>D0F78BBF-0A30-4c63-8A48-0F618A4AFACD</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-04-04 11:10</Created>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/DxeCorePerformanceLib/build.xml b/EdkModulePkg/Library/DxeCorePerformanceLib/build.xml
deleted file mode 100644
index c711b30e2c..0000000000
--- a/EdkModulePkg/Library/DxeCorePerformanceLib/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="DxeCorePerformanceLib"><!--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="Library/DxeCorePerformanceLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DxeCorePerformanceLib">
-      <GenBuild baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}/DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxeCorePerformanceLib.msa"/>
-   </target>
-   <target depends="DxeCorePerformanceLib_clean" name="clean"/>
-   <target depends="DxeCorePerformanceLib_cleanall" name="cleanall"/>
-   <target name="DxeCorePerformanceLib_clean">
-      <OutputDirSetup baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}/DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxeCorePerformanceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DxeCorePerformanceLib_cleanall">
-      <OutputDirSetup baseName="DxeCorePerformanceLib" mbdFilename="${MODULE_DIR}/DxeCorePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxeCorePerformanceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCorePerformanceLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DxeCorePerformanceLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.mbd b/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.mbd
deleted file mode 100644
index f3ca9a4321..0000000000
--- a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>DxeCoreTianoDecompressLibFromHob</BaseName>
-    <Guid>cef487a1-751d-4fe0-a39b-e6892b4610c8</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:10</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/build.xml b/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/build.xml
deleted file mode 100644
index c59b44c9e7..0000000000
--- a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/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="DxeCoreTianoDecompressLibFromHob"><!--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="Library/DxeCoreTianoDecompressLibFromHob"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DxeCoreTianoDecompressLibFromHob">
-      <GenBuild baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.msa"/>
-   </target>
-   <target depends="DxeCoreTianoDecompressLibFromHob_clean" name="clean"/>
-   <target depends="DxeCoreTianoDecompressLibFromHob_cleanall" name="cleanall"/>
-   <target name="DxeCoreTianoDecompressLibFromHob_clean">
-      <OutputDirSetup baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DxeCoreTianoDecompressLibFromHob_cleanall">
-      <OutputDirSetup baseName="DxeCoreTianoDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreTianoDecompressLibFromHob.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreTianoDecompressLibFromHob_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DxeCoreTianoDecompressLibFromHob*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.mbd b/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.mbd
deleted file mode 100644
index 5bb0b9344d..0000000000
--- a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>DxeCoreUefiDecompressLibFromHob</BaseName>
-    <Guid>5c12c06f-5cf8-48a6-9860-6c5b2c036bbf</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:10</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/build.xml b/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/build.xml
deleted file mode 100644
index 92fedafb07..0000000000
--- a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/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="DxeCoreUefiDecompressLibFromHob"><!--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="Library/DxeCoreUefiDecompressLibFromHob"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DxeCoreUefiDecompressLibFromHob">
-      <GenBuild baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.msa"/>
-   </target>
-   <target depends="DxeCoreUefiDecompressLibFromHob_clean" name="clean"/>
-   <target depends="DxeCoreUefiDecompressLibFromHob_cleanall" name="cleanall"/>
-   <target name="DxeCoreUefiDecompressLibFromHob_clean">
-      <OutputDirSetup baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DxeCoreUefiDecompressLibFromHob_cleanall">
-      <OutputDirSetup baseName="DxeCoreUefiDecompressLibFromHob" mbdFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.mbd" msaFilename="${MODULE_DIR}/DxeCoreUefiDecompressLibFromHob.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxeCoreUefiDecompressLibFromHob_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DxeCoreUefiDecompressLibFromHob*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.mbd b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.mbd
deleted file mode 100644
index 1d8df5409b..0000000000
--- a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.mbd
+++ /dev/null
@@ -1,29 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>DxePerformanceLib</BaseName>
-    <Guid>8B8B4CCC-65FC-41a5-8067-308B8E42CCF2</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 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-04-04 11:11</Created>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/DxePerformanceLib/build.xml b/EdkModulePkg/Library/DxePerformanceLib/build.xml
deleted file mode 100644
index a663483133..0000000000
--- a/EdkModulePkg/Library/DxePerformanceLib/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="DxePerformanceLib"><!--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="Library/DxePerformanceLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="DxePerformanceLib">
-      <GenBuild baseName="DxePerformanceLib" mbdFilename="${MODULE_DIR}/DxePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxePerformanceLib.msa"/>
-   </target>
-   <target depends="DxePerformanceLib_clean" name="clean"/>
-   <target depends="DxePerformanceLib_cleanall" name="cleanall"/>
-   <target name="DxePerformanceLib_clean">
-      <OutputDirSetup baseName="DxePerformanceLib" mbdFilename="${MODULE_DIR}/DxePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxePerformanceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxePerformanceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxePerformanceLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="DxePerformanceLib_cleanall">
-      <OutputDirSetup baseName="DxePerformanceLib" mbdFilename="${MODULE_DIR}/DxePerformanceLib.mbd" msaFilename="${MODULE_DIR}/DxePerformanceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/DxePerformanceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/DxePerformanceLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**DxePerformanceLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.mbd b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.mbd
deleted file mode 100644
index 9825a208c4..0000000000
--- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkDxeDebugLibReportStatusCode</BaseName>
-    <Guid>76a2a4d8-f605-407a-8057-4a17dcdc4c6d</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:12</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/build.xml b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/build.xml
deleted file mode 100644
index 6cedc55c5f..0000000000
--- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/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="EdkDxeDebugLibReportStatusCode"><!--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="Library/EdkDxeDebugLibReportStatusCode"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkDxeDebugLibReportStatusCode">
-      <GenBuild baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.msa"/>
-   </target>
-   <target depends="EdkDxeDebugLibReportStatusCode_clean" name="clean"/>
-   <target depends="EdkDxeDebugLibReportStatusCode_cleanall" name="cleanall"/>
-   <target name="EdkDxeDebugLibReportStatusCode_clean">
-      <OutputDirSetup baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkDxeDebugLibReportStatusCode_cleanall">
-      <OutputDirSetup baseName="EdkDxeDebugLibReportStatusCode" mbdFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.mbd" msaFilename="${MODULE_DIR}/EdkDxeDebugLibReportStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeDebugLibReportStatusCode_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkDxeDebugLibReportStatusCode*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.mbd b/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.mbd
deleted file mode 100644
index bc500a04a7..0000000000
--- a/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkDxePeCoffLoaderFromHobLib</BaseName>
-    <Guid>ed3de5c8-c389-44f2-a35e-2ebdc9802a49</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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-22 15:50</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/build.xml b/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/build.xml
deleted file mode 100644
index ad5f9c967d..0000000000
--- a/EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/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="EdkDxePeCoffLoaderFromHobLib"><!--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="Library/EdkDxePeCoffLoaderFromHobLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkDxePeCoffLoaderFromHobLib">
-      <GenBuild baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.msa"/>
-   </target>
-   <target depends="EdkDxePeCoffLoaderFromHobLib_clean" name="clean"/>
-   <target depends="EdkDxePeCoffLoaderFromHobLib_cleanall" name="cleanall"/>
-   <target name="EdkDxePeCoffLoaderFromHobLib_clean">
-      <OutputDirSetup baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkDxePeCoffLoaderFromHobLib_cleanall">
-      <OutputDirSetup baseName="EdkDxePeCoffLoaderFromHobLib" mbdFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePeCoffLoaderFromHobLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePeCoffLoaderFromHobLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkDxePeCoffLoaderFromHobLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.mbd b/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.mbd
deleted file mode 100644
index ca9912b2c1..0000000000
--- a/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkDxePrintLib</BaseName>
-    <Guid>50bcb105-6634-441d-b403-659110a03ad2</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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkDxePrintLib/build.xml b/EdkModulePkg/Library/EdkDxePrintLib/build.xml
deleted file mode 100644
index e9ae5b6700..0000000000
--- a/EdkModulePkg/Library/EdkDxePrintLib/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="EdkDxePrintLib"><!--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="Library/EdkDxePrintLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkDxePrintLib">
-      <GenBuild baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}/EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePrintLib.msa"/>
-   </target>
-   <target depends="EdkDxePrintLib_clean" name="clean"/>
-   <target depends="EdkDxePrintLib_cleanall" name="cleanall"/>
-   <target name="EdkDxePrintLib_clean">
-      <OutputDirSetup baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}/EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePrintLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkDxePrintLib_cleanall">
-      <OutputDirSetup baseName="EdkDxePrintLib" mbdFilename="${MODULE_DIR}/EdkDxePrintLib.mbd" msaFilename="${MODULE_DIR}/EdkDxePrintLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxePrintLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkDxePrintLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.mbd b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.mbd
deleted file mode 100644
index 72edffb8ba..0000000000
--- a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkDxeRuntimeDriverLib</BaseName>
-    <Guid>b1ee6c28-54aa-4d17-b705-3e28ccb27b2e</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:13</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/build.xml b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/build.xml
deleted file mode 100644
index 1442612686..0000000000
--- a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/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="EdkDxeRuntimeDriverLib"><!--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="Library/EdkDxeRuntimeDriverLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkDxeRuntimeDriverLib">
-      <GenBuild baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.msa"/>
-   </target>
-   <target depends="EdkDxeRuntimeDriverLib_clean" name="clean"/>
-   <target depends="EdkDxeRuntimeDriverLib_cleanall" name="cleanall"/>
-   <target name="EdkDxeRuntimeDriverLib_clean">
-      <OutputDirSetup baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkDxeRuntimeDriverLib_cleanall">
-      <OutputDirSetup baseName="EdkDxeRuntimeDriverLib" mbdFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeRuntimeDriverLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeRuntimeDriverLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkDxeRuntimeDriverLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.mbd b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.mbd
deleted file mode 100644
index dababd27ad..0000000000
--- a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkDxeSalLib</BaseName>
-    <Guid>61999c3c-72a5-4506-a4ff-4271d18a1d14</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:13</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkDxeSalLib/build.xml b/EdkModulePkg/Library/EdkDxeSalLib/build.xml
deleted file mode 100644
index 580d1a6e97..0000000000
--- a/EdkModulePkg/Library/EdkDxeSalLib/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="EdkDxeSalLib"><!--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="Library/EdkDxeSalLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkDxeSalLib">
-      <GenBuild baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}/EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeSalLib.msa"/>
-   </target>
-   <target depends="EdkDxeSalLib_clean" name="clean"/>
-   <target depends="EdkDxeSalLib_cleanall" name="cleanall"/>
-   <target name="EdkDxeSalLib_clean">
-      <OutputDirSetup baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}/EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeSalLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkDxeSalLib_cleanall">
-      <OutputDirSetup baseName="EdkDxeSalLib" mbdFilename="${MODULE_DIR}/EdkDxeSalLib.mbd" msaFilename="${MODULE_DIR}/EdkDxeSalLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkDxeSalLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkDxeSalLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.mbd b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.mbd
deleted file mode 100644
index a5ee7cb19d..0000000000
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkFvbServiceLib</BaseName>
-    <Guid>bd4d540e-04b0-4b10-8fd5-4a7bb533cf67</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:13</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/build.xml b/EdkModulePkg/Library/EdkFvbServiceLib/build.xml
deleted file mode 100644
index a111fb2c47..0000000000
--- a/EdkModulePkg/Library/EdkFvbServiceLib/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="EdkFvbServiceLib"><!--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="Library/EdkFvbServiceLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkFvbServiceLib">
-      <GenBuild baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}/EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}/EdkFvbServiceLib.msa"/>
-   </target>
-   <target depends="EdkFvbServiceLib_clean" name="clean"/>
-   <target depends="EdkFvbServiceLib_cleanall" name="cleanall"/>
-   <target name="EdkFvbServiceLib_clean">
-      <OutputDirSetup baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}/EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}/EdkFvbServiceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkFvbServiceLib_cleanall">
-      <OutputDirSetup baseName="EdkFvbServiceLib" mbdFilename="${MODULE_DIR}/EdkFvbServiceLib.mbd" msaFilename="${MODULE_DIR}/EdkFvbServiceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkFvbServiceLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkFvbServiceLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.mbd b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.mbd
deleted file mode 100644
index 4758d6b192..0000000000
--- a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkGraphicsLib</BaseName>
-    <Guid>08c1a0e4-1208-47f8-a2c5-f42eabee653a</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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkGraphicsLib/build.xml b/EdkModulePkg/Library/EdkGraphicsLib/build.xml
deleted file mode 100644
index 1bb245880d..0000000000
--- a/EdkModulePkg/Library/EdkGraphicsLib/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="EdkGraphicsLib"><!--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="Library/EdkGraphicsLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkGraphicsLib">
-      <GenBuild baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}/EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}/EdkGraphicsLib.msa"/>
-   </target>
-   <target depends="EdkGraphicsLib_clean" name="clean"/>
-   <target depends="EdkGraphicsLib_cleanall" name="cleanall"/>
-   <target name="EdkGraphicsLib_clean">
-      <OutputDirSetup baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}/EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}/EdkGraphicsLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkGraphicsLib_cleanall">
-      <OutputDirSetup baseName="EdkGraphicsLib" mbdFilename="${MODULE_DIR}/EdkGraphicsLib.mbd" msaFilename="${MODULE_DIR}/EdkGraphicsLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkGraphicsLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkGraphicsLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.mbd b/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.mbd
deleted file mode 100644
index 3864ea2a5c..0000000000
--- a/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkIfrSupportLib</BaseName>
-    <Guid>ea55bada-d488-427b-9d2d-227e0aaa3707</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:14</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkIfrSupportLib/build.xml b/EdkModulePkg/Library/EdkIfrSupportLib/build.xml
deleted file mode 100644
index 50edb6a393..0000000000
--- a/EdkModulePkg/Library/EdkIfrSupportLib/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="EdkIfrSupportLib"><!--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="Library/EdkIfrSupportLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkIfrSupportLib">
-      <GenBuild baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}/EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}/EdkIfrSupportLib.msa"/>
-   </target>
-   <target depends="EdkIfrSupportLib_clean" name="clean"/>
-   <target depends="EdkIfrSupportLib_cleanall" name="cleanall"/>
-   <target name="EdkIfrSupportLib_clean">
-      <OutputDirSetup baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}/EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}/EdkIfrSupportLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkIfrSupportLib_cleanall">
-      <OutputDirSetup baseName="EdkIfrSupportLib" mbdFilename="${MODULE_DIR}/EdkIfrSupportLib.mbd" msaFilename="${MODULE_DIR}/EdkIfrSupportLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkIfrSupportLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkIfrSupportLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.mbd b/EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.mbd
deleted file mode 100644
index 01e0cb2e4a..0000000000
--- a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkMemoryStatusCodeLib</BaseName>
-    <Guid>e2368d1d-4c94-4e62-be2f-7817bbd78293</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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/build.xml b/EdkModulePkg/Library/EdkMemoryStatusCodeLib/build.xml
deleted file mode 100644
index 1efd30477d..0000000000
--- a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/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="EdkMemoryStatusCodeLib"><!--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="Library/EdkMemoryStatusCodeLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkMemoryStatusCodeLib">
-      <GenBuild baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.msa"/>
-   </target>
-   <target depends="EdkMemoryStatusCodeLib_clean" name="clean"/>
-   <target depends="EdkMemoryStatusCodeLib_cleanall" name="cleanall"/>
-   <target name="EdkMemoryStatusCodeLib_clean">
-      <OutputDirSetup baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkMemoryStatusCodeLib_cleanall">
-      <OutputDirSetup baseName="EdkMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.mbd" msaFilename="${MODULE_DIR}/EdkMemoryStatusCodeLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkMemoryStatusCodeLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkMemoryStatusCodeLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.mbd b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.mbd
deleted file mode 100644
index a6a6d56a1c..0000000000
--- a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkNullCustomizedDecompressLib</BaseName>
-    <Guid>4a024320-0648-49c3-84d4-3d04670a1c77</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/build.xml b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/build.xml
deleted file mode 100644
index 815ab35c2d..0000000000
--- a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/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="EdkNullCustomizedDecompressLib"><!--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="Library/EdkNullCustomizedDecompressLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkNullCustomizedDecompressLib">
-      <GenBuild baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.msa"/>
-   </target>
-   <target depends="EdkNullCustomizedDecompressLib_clean" name="clean"/>
-   <target depends="EdkNullCustomizedDecompressLib_cleanall" name="cleanall"/>
-   <target name="EdkNullCustomizedDecompressLib_clean">
-      <OutputDirSetup baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkNullCustomizedDecompressLib_cleanall">
-      <OutputDirSetup baseName="EdkNullCustomizedDecompressLib" mbdFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.mbd" msaFilename="${MODULE_DIR}/EdkNullCustomizedDecompressLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkNullCustomizedDecompressLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkNullCustomizedDecompressLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderLib/EdkPeCoffLoaderLib.mbd b/EdkModulePkg/Library/EdkPeCoffLoaderLib/EdkPeCoffLoaderLib.mbd
deleted file mode 100644
index 4ffdf99f8f..0000000000
--- a/EdkModulePkg/Library/EdkPeCoffLoaderLib/EdkPeCoffLoaderLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkPeCoffLoaderLib</BaseName>
-    <Guid>858bbbc9-474f-4556-a361-0ae52a44ffa5</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderLib/build.xml b/EdkModulePkg/Library/EdkPeCoffLoaderLib/build.xml
deleted file mode 100644
index f3339fe44a..0000000000
--- a/EdkModulePkg/Library/EdkPeCoffLoaderLib/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="EdkPeCoffLoaderLib"><!--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="Library/EdkPeCoffLoaderLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkPeCoffLoaderLib">
-      <GenBuild baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.msa"/>
-   </target>
-   <target depends="EdkPeCoffLoaderLib_clean" name="clean"/>
-   <target depends="EdkPeCoffLoaderLib_cleanall" name="cleanall"/>
-   <target name="EdkPeCoffLoaderLib_clean">
-      <OutputDirSetup baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkPeCoffLoaderLib_cleanall">
-      <OutputDirSetup baseName="EdkPeCoffLoaderLib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkPeCoffLoaderLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderLibX64/EdkPeCoffLoaderLibX64.mbd b/EdkModulePkg/Library/EdkPeCoffLoaderLibX64/EdkPeCoffLoaderLibX64.mbd
deleted file mode 100644
index fd0b050241..0000000000
--- a/EdkModulePkg/Library/EdkPeCoffLoaderLibX64/EdkPeCoffLoaderLibX64.mbd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkPeCoffLoaderLibX64</BaseName>
-    <Guid>742597d6-2b50-4120-bfba-2400549a792f</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00090000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 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-04-26 13:50</Created>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderLibX64/build.xml b/EdkModulePkg/Library/EdkPeCoffLoaderLibX64/build.xml
deleted file mode 100644
index 6a4190076f..0000000000
--- a/EdkModulePkg/Library/EdkPeCoffLoaderLibX64/build.xml
+++ /dev/null
@@ -1,46 +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="EdkPeCoffLoaderLibX64"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <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="Library/EdkPeCoffLoaderLibX64"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkPeCoffLoaderLibX64">
-      <GenBuild baseName="EdkPeCoffLoaderLibX64" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLibX64.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLibX64.msa"/>
-   </target>
-   <target depends="EdkPeCoffLoaderLibX64_clean" name="clean"/>
-   <target depends="EdkPeCoffLoaderLibX64_cleanAll" name="cleanAll"/>
-   <target name="EdkPeCoffLoaderLibX64_clean">
-      <OutputDirSetup baseName="EdkPeCoffLoaderLibX64" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLibX64.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLibX64.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLibX64_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLibX64_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkPeCoffLoaderLibX64_cleanAll">
-      <OutputDirSetup baseName="EdkPeCoffLoaderLibX64" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderLibX64.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderLibX64.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLibX64_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderLibX64_build.xml" target="cleanAll"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkPeCoffLoaderLibX64*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/EdkPeCoffLoaderX64Lib.mbd b/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/EdkPeCoffLoaderX64Lib.mbd
deleted file mode 100644
index 8b6f365014..0000000000
--- a/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/EdkPeCoffLoaderX64Lib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkPeCoffLoaderX64Lib</BaseName>
-    <Guid>6aac37f2-7b46-4ef3-8645-c24800a3d410</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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-04-03 23:59</Created>
-    <Modified>2006-04-05 21:30</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/build.xml b/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/build.xml
deleted file mode 100644
index 7114597571..0000000000
--- a/EdkModulePkg/Library/EdkPeCoffLoaderX64Lib/build.xml
+++ /dev/null
@@ -1,46 +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="EdkPeCoffLoaderX64Lib"><!--Apply external ANT tasks-->
-   <taskdef resource="GenBuild.tasks"/>
-   <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="Library/EdkPeCoffLoaderX64Lib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkPeCoffLoaderX64Lib">
-      <GenBuild baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.msa"/>
-   </target>
-   <target depends="EdkPeCoffLoaderX64Lib_clean" name="clean"/>
-   <target depends="EdkPeCoffLoaderX64Lib_cleanAll" name="cleanAll"/>
-   <target name="EdkPeCoffLoaderX64Lib_clean">
-      <OutputDirSetup baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkPeCoffLoaderX64Lib_cleanAll">
-      <OutputDirSetup baseName="EdkPeCoffLoaderX64Lib" mbdFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.mbd" msaFilename="${MODULE_DIR}/EdkPeCoffLoaderX64Lib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkPeCoffLoaderX64Lib_build.xml" target="cleanAll"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkPeCoffLoaderX64Lib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/BsDataHubStatusCode.mbd b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/BsDataHubStatusCode.mbd
deleted file mode 100644
index ce1bd63b0d..0000000000
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/BsDataHubStatusCode.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkBsDataHubStatusCodeLib</BaseName>
-    <Guid>041bf780-dc3e-49ab-8d67-4b86075440ea</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/build.xml b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/build.xml
deleted file mode 100644
index 4c7f99b78e..0000000000
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/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="EdkBsDataHubStatusCodeLib"><!--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="Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkBsDataHubStatusCodeLib">
-      <GenBuild baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}/BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}/BsDataHubStatusCode.msa"/>
-   </target>
-   <target depends="EdkBsDataHubStatusCodeLib_clean" name="clean"/>
-   <target depends="EdkBsDataHubStatusCodeLib_cleanall" name="cleanall"/>
-   <target name="EdkBsDataHubStatusCodeLib_clean">
-      <OutputDirSetup baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}/BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}/BsDataHubStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkBsDataHubStatusCodeLib_cleanall">
-      <OutputDirSetup baseName="EdkBsDataHubStatusCodeLib" mbdFilename="${MODULE_DIR}/BsDataHubStatusCode.mbd" msaFilename="${MODULE_DIR}/BsDataHubStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkBsDataHubStatusCodeLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkBsDataHubStatusCodeLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/RtMemoryStatusCode.mbd b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/RtMemoryStatusCode.mbd
deleted file mode 100644
index 1795204d66..0000000000
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/RtMemoryStatusCode.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkRtMemoryStatusCodeLib</BaseName>
-    <Guid>1517564b-ab66-42b7-8903-731a95f314f9</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/build.xml b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/build.xml
deleted file mode 100644
index 5152c1447b..0000000000
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/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="EdkRtMemoryStatusCodeLib"><!--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="Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkRtMemoryStatusCodeLib">
-      <GenBuild baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}/RtMemoryStatusCode.msa"/>
-   </target>
-   <target depends="EdkRtMemoryStatusCodeLib_clean" name="clean"/>
-   <target depends="EdkRtMemoryStatusCodeLib_cleanall" name="cleanall"/>
-   <target name="EdkRtMemoryStatusCodeLib_clean">
-      <OutputDirSetup baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}/RtMemoryStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkRtMemoryStatusCodeLib_cleanall">
-      <OutputDirSetup baseName="EdkRtMemoryStatusCodeLib" mbdFilename="${MODULE_DIR}/RtMemoryStatusCode.mbd" msaFilename="${MODULE_DIR}/RtMemoryStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtMemoryStatusCodeLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkRtMemoryStatusCodeLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/RtPlatformStatusCode.mbd b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/RtPlatformStatusCode.mbd
deleted file mode 100644
index 64591313c7..0000000000
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/RtPlatformStatusCode.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkRtPlatformStatusCodeLib</BaseName>
-    <Guid>68b157b5-9534-43ff-9cd3-6705e4e1d56c</Guid>
-    <Version>0</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004 - 2005, 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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/build.xml b/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/build.xml
deleted file mode 100644
index 2cffff0785..0000000000
--- a/EdkModulePkg/Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/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="EdkRtPlatformStatusCodeLib"><!--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="Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkRtPlatformStatusCodeLib">
-      <GenBuild baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}/RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}/RtPlatformStatusCode.msa"/>
-   </target>
-   <target depends="EdkRtPlatformStatusCodeLib_clean" name="clean"/>
-   <target depends="EdkRtPlatformStatusCodeLib_cleanall" name="cleanall"/>
-   <target name="EdkRtPlatformStatusCodeLib_clean">
-      <OutputDirSetup baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}/RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}/RtPlatformStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkRtPlatformStatusCodeLib_cleanall">
-      <OutputDirSetup baseName="EdkRtPlatformStatusCodeLib" mbdFilename="${MODULE_DIR}/RtPlatformStatusCode.mbd" msaFilename="${MODULE_DIR}/RtPlatformStatusCode.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkRtPlatformStatusCodeLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkRtPlatformStatusCodeLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.mbd b/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.mbd
deleted file mode 100644
index 18d03c26b1..0000000000
--- a/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkScsiLib</BaseName>
-    <Guid>46c9adef-aee6-410c-99e4-240e3af18d8b</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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkScsiLib/build.xml b/EdkModulePkg/Library/EdkScsiLib/build.xml
deleted file mode 100644
index 56e97015f3..0000000000
--- a/EdkModulePkg/Library/EdkScsiLib/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="EdkScsiLib"><!--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="Library/EdkScsiLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkScsiLib">
-      <GenBuild baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}/EdkScsiLib.mbd" msaFilename="${MODULE_DIR}/EdkScsiLib.msa"/>
-   </target>
-   <target depends="EdkScsiLib_clean" name="clean"/>
-   <target depends="EdkScsiLib_cleanall" name="cleanall"/>
-   <target name="EdkScsiLib_clean">
-      <OutputDirSetup baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}/EdkScsiLib.mbd" msaFilename="${MODULE_DIR}/EdkScsiLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkScsiLib_cleanall">
-      <OutputDirSetup baseName="EdkScsiLib" mbdFilename="${MODULE_DIR}/EdkScsiLib.mbd" msaFilename="${MODULE_DIR}/EdkScsiLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkScsiLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkScsiLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.mbd b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.mbd
deleted file mode 100644
index 08bc04d0b0..0000000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkUefiDebugLibConOut</BaseName>
-    <Guid>7293fe0b-1fff-4f8f-b808-10cb55f6a174</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:14</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/build.xml b/EdkModulePkg/Library/EdkUefiDebugLibConOut/build.xml
deleted file mode 100644
index 864a64f71a..0000000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/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="EdkUefiDebugLibConOut"><!--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="Library/EdkUefiDebugLibConOut"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkUefiDebugLibConOut">
-      <GenBuild baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.msa"/>
-   </target>
-   <target depends="EdkUefiDebugLibConOut_clean" name="clean"/>
-   <target depends="EdkUefiDebugLibConOut_cleanall" name="cleanall"/>
-   <target name="EdkUefiDebugLibConOut_clean">
-      <OutputDirSetup baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkUefiDebugLibConOut_cleanall">
-      <OutputDirSetup baseName="EdkUefiDebugLibConOut" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibConOut.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibConOut_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkUefiDebugLibConOut*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.mbd b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.mbd
deleted file mode 100644
index 833b2eea09..0000000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkUefiDebugLibStdErr</BaseName>
-    <Guid>8b9968e0-c76b-4b57-aec4-24e17fe602c0</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</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-31 13:14</Modified>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/build.xml b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/build.xml
deleted file mode 100644
index 20eb35128b..0000000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/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="EdkUefiDebugLibStdErr"><!--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="Library/EdkUefiDebugLibStdErr"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkUefiDebugLibStdErr">
-      <GenBuild baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.msa"/>
-   </target>
-   <target depends="EdkUefiDebugLibStdErr_clean" name="clean"/>
-   <target depends="EdkUefiDebugLibStdErr_cleanall" name="cleanall"/>
-   <target name="EdkUefiDebugLibStdErr_clean">
-      <OutputDirSetup baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkUefiDebugLibStdErr_cleanall">
-      <OutputDirSetup baseName="EdkUefiDebugLibStdErr" mbdFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.mbd" msaFilename="${MODULE_DIR}/EdkUefiDebugLibStdErr.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkUefiDebugLibStdErr_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkUefiDebugLibStdErr*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkUsbLib/EdkUsbLib.mbd b/EdkModulePkg/Library/EdkUsbLib/EdkUsbLib.mbd
deleted file mode 100644
index 79fa4b10fc..0000000000
--- a/EdkModulePkg/Library/EdkUsbLib/EdkUsbLib.mbd
+++ /dev/null
@@ -1,30 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>EdkUsbLib</BaseName>
-    <Guid>87eb5df9-722a-4241-ad7f-370d0b3a56d7</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>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/EdkUsbLib/build.xml b/EdkModulePkg/Library/EdkUsbLib/build.xml
deleted file mode 100644
index 501838adfd..0000000000
--- a/EdkModulePkg/Library/EdkUsbLib/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="EdkUsbLib"><!--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="Library/EdkUsbLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="EdkUsbLib">
-      <GenBuild baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}/EdkUsbLib.mbd" msaFilename="${MODULE_DIR}/EdkUsbLib.msa"/>
-   </target>
-   <target depends="EdkUsbLib_clean" name="clean"/>
-   <target depends="EdkUsbLib_cleanall" name="cleanall"/>
-   <target name="EdkUsbLib_clean">
-      <OutputDirSetup baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}/EdkUsbLib.mbd" msaFilename="${MODULE_DIR}/EdkUsbLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="EdkUsbLib_cleanall">
-      <OutputDirSetup baseName="EdkUsbLib" mbdFilename="${MODULE_DIR}/EdkUsbLib.mbd" msaFilename="${MODULE_DIR}/EdkUsbLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/EdkUsbLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**EdkUsbLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
diff --git a/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.mbd b/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.mbd
deleted file mode 100644
index 8dba9c21c1..0000000000
--- a/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.mbd
+++ /dev/null
@@ -1,29 +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.
--->
-<LibraryModuleBuildDescription 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">
-  <MbdLibHeader>
-    <BaseName>PeiPerformanceLib</BaseName>
-    <Guid>F72DE735-B24F-4ef6-897F-70A85D01A047</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 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-04-04 11:12</Created>
-  </MbdLibHeader>
-</LibraryModuleBuildDescription>
diff --git a/EdkModulePkg/Library/PeiPerformanceLib/build.xml b/EdkModulePkg/Library/PeiPerformanceLib/build.xml
deleted file mode 100644
index e0bd259b3a..0000000000
--- a/EdkModulePkg/Library/PeiPerformanceLib/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="PeiPerformanceLib"><!--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="Library/PeiPerformanceLib"/>
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>
-   <target name="PeiPerformanceLib">
-      <GenBuild baseName="PeiPerformanceLib" mbdFilename="${MODULE_DIR}/PeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}/PeiPerformanceLib.msa"/>
-   </target>
-   <target depends="PeiPerformanceLib_clean" name="clean"/>
-   <target depends="PeiPerformanceLib_cleanall" name="cleanall"/>
-   <target name="PeiPerformanceLib_clean">
-      <OutputDirSetup baseName="PeiPerformanceLib" mbdFilename="${MODULE_DIR}/PeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}/PeiPerformanceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PeiPerformanceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PeiPerformanceLib_build.xml" target="clean"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
-   </target>
-   <target name="PeiPerformanceLib_cleanall">
-      <OutputDirSetup baseName="PeiPerformanceLib" mbdFilename="${MODULE_DIR}/PeiPerformanceLib.mbd" msaFilename="${MODULE_DIR}/PeiPerformanceLib.msa"/>
-      <if>
-         <available file="${DEST_DIR_OUTPUT}/PeiPerformanceLib_build.xml"/>
-         <then>
-            <ant antfile="${DEST_DIR_OUTPUT}/PeiPerformanceLib_build.xml" target="cleanall"/>
-         </then>
-      </if>
-      <delete dir="${DEST_DIR_OUTPUT}"/>
-      <delete dir="${DEST_DIR_DEBUG}"/>
-      <delete>
-         <fileset dir="${BIN_DIR}" includes="**PeiPerformanceLib*"/>
-      </delete>
-   </target>
-</project>
-\ No newline at end of file
author	jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>	2006-07-07 09:28:33 +0000
committer	jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>	2006-07-07 09:28:33 +0000
commit	44050d53afe3a38812977a3e8f5f2860237a3690 (patch)
tree	0138fcdbb0d3082353dd090eca504824566a6179 /EdkModulePkg/Library
parent	f46d7c213b49f97e68d6339aa9df3f70b15d9b59 (diff)
download	edk2-platforms-44050d53afe3a38812977a3e8f5f2860237a3690.tar.xz