25 files changed, 0 insertions, 2246 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.msa b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.msa
deleted file mode 100644
index de7bb79325..0000000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.msa
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>IsaBus</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>240612B5-A063-11d4-9A3A-0090273FC14D</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for IsaBus module.</Abstract>
-    <Description>Discovers all the ISA Controllers and their resources by using the ISA PnP
-      Protocol, produces an instance of the ISA I/O Protocol for every ISA
-      Controller found, loads and initializes all ISA Device Drivers, matches ISA
-      Device Drivers with their respective ISA Controllers in a deterministic
-      manner, and informs a ISA Device Driver when it is to start managing an ISA
-      Controller.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation<BR></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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>IsaBus</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BootScriptLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ComponentName.h</Filename>
-    <Filename>IsaAcpi.h</Filename>
-    <Filename>IsaBus.h</Filename>
-    <Filename>IsaIo.h</Filename>
-    <Filename>IsaBus.c</Filename>
-    <Filename>IsaIo.c</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-    <Package PackageGuid="bea835f9-fd62-464a-81ff-f3a806360c6b"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiIsaAcpiProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiIsaIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gIsaBusControllerDriver</DriverBinding>
-      <ComponentName>gIsaBusComponentName</ComponentName>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdIsaBusSupportIsaMemory</C_Name>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag is used to enable the implementation for interface 
-      _EFI_ISA_IO_PROTOCOL.Mem.Read, _EFI_ISA_IO_PROTOCOL.Mem.Write and _EFI_ISA_IO_PROTOCOL.CopyMem. 
-      If it is unset, these interfaces will return EFI_UNSUPPORTED. When it is disabled, 
-      it is will save code size if a platform does not have ISA device with ISA memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdIsaBusSupportDma</C_Name>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag is used to enable the implementation for interface 
-      _EFI_ISA_IO_PROTOCOL.AllocateBuffer, _EFI_ISA_IO_PROTOCOL.FreeBuffer, _EFI_ISA_IO_PROTOCOL.Map 
-      and _EFI_ISA_IO_PROTOCOL.UnMap. If it is unset, these interfaces will return EFI_UNSUPPORTED. 
-      It is useful to save code size if a platform does not have ISA device which did DMA transfer.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdIsaBusOnlySupportSlaveDma</C_Name>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag is used to enable the implementation for interface 
-      _EFI_ISA_IO_PROTOCOL.Map and _EFI_ISA_IO_PROTOCOL.UnMap to only support Slave DMA 
-      transfers. In addition, unsetting this feature flag also make AllocateBuffer() and 
-      FreeBuffer() to return EFI_UNSUPPORTED. It is useful to save code size if a platform have only 
-      ISA device to do slave DMA R/W transfer. This flag is only effective when PcdIsaBusSupportDma 
-      is set to TRUE. If PcdIsaBusSupportDma is set to FALSE, Map() and UnMap() will simply 
-      return EFI_UNSUPPORTED. Please check description for PcdIsaBusSupportDma for details.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.msa b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.msa
deleted file mode 100644
index dfe69890ce..0000000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.msa
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>IsaFloppy</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>0abd8284-6da3-4616-971a-83a5148067ba</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for IsaFloppy module.</Abstract>
-    <Description>ISA Floppy Driver
-        1. Support two types diskette drive
-           1.44M drive and 2.88M drive (and now only support 1.44M)
-        2. Support two diskette drives
-        3. Use DMA channel 2 to transfer data
-        4. Do not use interrupt
-        5. Support diskette change line signal and write protect
-
-        Conforming to EFI driver model</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation<BR></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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>IsaFloppy</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>IsaFloppy.h</Filename>
-    <Filename>IsaFloppy.c</Filename>
-    <Filename>IsaFloppyBlock.c</Filename>
-    <Filename>IsaFloppyCtrl.c</Filename>
-    <Filename>ComponentName.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiIsaIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Events>
-    <CreateEvents>
-      <EventTypes Usage="ALWAYS_CONSUMED">
-        <EventType>EVENT_TYPE_PERIODIC_TIMER</EventType>
-        <HelpText>Timer event for each Floppd Disk Controller to control the motor on and off.</HelpText>
-      </EventTypes>
-    </CreateEvents>
-  </Events>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gFdcControllerDriver</DriverBinding>
-      <ComponentName>gIsaFloppyComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.msa b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.msa
deleted file mode 100644
index 4e6592e21d..0000000000
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerial.msa
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>IsaSerial</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>93B80003-9FB3-11d4-9A3A-0090273FC14D</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for IsaSerial module.</Abstract>
-    <Description>Serial driver for standard UARTS on an ISA bus.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation<BR></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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>IsaSerial</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>serial.c</Filename>
-    <Filename>serial.h</Filename>
-    <Filename>ComponentName.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiIsaIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gSerialControllerDriver</DriverBinding>
-      <ComponentName>gIsaSerialComponentName</ComponentName>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdNtEmulatorEnable</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If this PCD is set as TRUE, NT emulator will be endabled.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa
deleted file mode 100644
index dbc4cc5169..0000000000
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.msa
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Ps2Keyboard</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>3DC82376-637B-40a6-A8FC-A565417F2C38</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Ps2 Keyboard Driver</Abstract>
-    <Description>This dirver directly uses IsaIo protocol service to support KeyBoard work.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Ps2Keyboard</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>    
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Ps2Keyboard.c</Filename>
-    <Filename>Ps2KbdTextIn.c</Filename>
-    <Filename>Ps2KbdCtrller.c</Filename>
-    <Filename>Ps2Keyboard.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-    <Package PackageGuid="bea835f9-fd62-464a-81ff-f3a806360c6b"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiIsaIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPs2PolicyProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Events>
-    <CreateEvents>
-      <EventTypes Usage="ALWAYS_PRODUCED">
-        <EventType>EVENT_TYPE_RELATIVE_TIMER</EventType>
-        <HelpText>Set up  event in order to wait for key stroke</HelpText>
-      </EventTypes>
-      <EventTypes Usage="ALWAYS_PRODUCED">
-        <EventType>EVENT_TYPE_PERIODIC_TIMER</EventType>
-        <HelpText>Set up a periodic timer to read key strokes at a fixed interval</HelpText>
-      </EventTypes>
-    </CreateEvents>
-    <SignalEvents>
-      <EventTypes Usage="SOMETIMES_PRODUCED">
-        <EventType>EVENT_TYPE_PERIODIC_TIMER</EventType>
-        <HelpText>Signal an event wheneven there is a key pending</HelpText>
-      </EventTypes>
-    </SignalEvents>
-  </Events>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gKeyboardControllerDriver</DriverBinding>
-      <ComponentName>gPs2KeyboardComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.msa b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.msa
deleted file mode 100644
index 7509b324b4..0000000000
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.msa
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Ps2MouseAbsolutePointer</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>2899C94A-1FB6-4b1a-B96B-8364975303E0</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Ps2 Mouse Absolute Pointer Driver</Abstract>
-    <Description>This dirver directly uses IsaIo protocol service to support a faked Ps2 touchpad work.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Ps2MouseAbsolutePointer</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Ps2MouseAbsolutePointer.c</Filename>
-    <Filename>Ps2MouseAbsolutePointer.h</Filename>
-    <Filename>CommPs2.c</Filename>
-    <Filename>CommPs2.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiAbsolutePointerProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiIsaIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Events>
-    <CreateEvents>
-      <EventTypes Usage="ALWAYS_PRODUCED">
-        <EventType>EVENT_TYPE_RELATIVE_TIMER</EventType>
-        <HelpText>Set up a time event to wait for the faked touchpad input</HelpText>
-      </EventTypes>
-      <EventTypes Usage="ALWAYS_PRODUCED">
-        <EventType>EVENT_TYPE_PERIODIC_TIMER</EventType>
-        <HelpText>Set up a periodic timer to poll the faked touchpad state at a fixed interval</HelpText>
-      </EventTypes>
-    </CreateEvents>
-    <SignalEvents>
-      <EventTypes Usage="SOMETIMES_PRODUCED">
-        <EventType>EVENT_TYPE_RELATIVE_TIMER</EventType>
-        <HelpText>Signal an event whenever these is a pending event from the faked touchpad input</HelpText>
-      </EventTypes>
-    </SignalEvents>
-  </Events>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gPS2MouseAbsolutePointerDriver</DriverBinding>
-      <ComponentName>gPs2MouseAbsolutePointerComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa
deleted file mode 100644
index 9f12700975..0000000000
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.msa
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>Ps2Mouse</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>202A2B0E-9A31-4812-B291-8747DF152439</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Ps2 Mouse Driver</Abstract>
-    <Description>This dirver directly uses IsaIo protocol service to support Ps2 mouse work.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>Ps2Mouse</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Ps2Mouse.c</Filename>
-    <Filename>Ps2Mouse.h</Filename>
-    <Filename>CommPs2.c</Filename>
-    <Filename>CommPs2.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiIsaIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Events>
-    <CreateEvents>
-      <EventTypes Usage="ALWAYS_PRODUCED">
-        <EventType>EVENT_TYPE_RELATIVE_TIMER</EventType>
-        <HelpText>Set up a time event to wait for the mouse input</HelpText>
-      </EventTypes>
-      <EventTypes Usage="ALWAYS_PRODUCED">
-        <EventType>EVENT_TYPE_PERIODIC_TIMER</EventType>
-        <HelpText>Set up a periodic timer to poll mouse state at a fixed interval</HelpText>
-      </EventTypes>
-    </CreateEvents>
-    <SignalEvents>
-      <EventTypes Usage="SOMETIMES_PRODUCED">
-        <EventType>EVENT_TYPE_RELATIVE_TIMER</EventType>
-        <HelpText>Signal an event whenever these is a pending event from mouse input</HelpText>
-      </EventTypes>
-    </SignalEvents>
-  </Events>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gPS2MouseDriver</DriverBinding>
-      <ComponentName>gPs2MouseComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.msa b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.msa
deleted file mode 100644
index 7d8e9ad259..0000000000
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdebusDxe.msa
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>IdeBus</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>69FD8E47-A161-4550-B01A-5594CEB2B2B2</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PS2 keyboard module.</Abstract>
-    <Description>IDE bus driver. This driver will enumerate IDE device and export the blockIo
-      protocol for every device.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>IdeBus</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PerformanceLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>idebus.h</Filename>
-    <Filename>ide.h</Filename>
-    <Filename>idedata.h</Filename>
-    <Filename>idebus.c</Filename>
-    <Filename>ide.c</Filename>
-    <Filename>ata.c</Filename>
-    <Filename>atapi.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>ComponentName.h</Filename>
-    <Filename>DriverConfiguration.c</Filename>
-    <Filename>DriverDiagnostics.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="2759ded5-bb57-4b06-af4f-c398fa552719"/>
-    <Package PackageGuid="BA0D78D6-2CAF-414b-BD4D-B6762A894288"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiIdeControllerInitProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiDiskInfoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Variables>
-    <Variable Usage="ALWAYS_CONSUMED">
-      <VariableName>0x0043 0x006F 0x006E 0x0066 0x0069 0x0067 0x0075 0x0072 0x0061 0x0074 0x0069 0x006F 0x006E</VariableName>
-      <GuidC_Name>gConfigurationGuid</GuidC_Name>
-    </Variable>
-  </Variables>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiDiskInfoIdeInterfaceGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gIDEBusDriverBinding</DriverBinding>
-      <ComponentName>gIDEBusComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.msa b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.msa
deleted file mode 100644
index 655fb4f1b1..0000000000
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.msa
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PciBus</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>93B80004-9FB3-11d4-9A3A-0090273FC14D</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PciBus module.</Abstract>
-    <Description>PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO
-       space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable
-       support hot plug.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PciBus</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PciIncompatibleDeviceSupportLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>pcibus.h</Filename>
-    <Filename>PciIo.h</Filename>
-    <Filename>PciCommand.h</Filename>
-    <Filename>PciDeviceSupport.h</Filename>
-    <Filename>PciResourceSupport.h</Filename>
-    <Filename>PciEnumerator.h</Filename>
-    <Filename>PciEnumeratorSupport.h</Filename>
-    <Filename>PciOptionRomSupport.h</Filename>
-    <Filename>PciRomTable.h</Filename>
-    <Filename>PciHotPlugSupport.h</Filename>
-    <Filename>PciLib.h</Filename>
-    <Filename>PciHotPlugSupport.c</Filename>
-    <Filename>PciRomTable.c</Filename>
-    <Filename>PciDriverOverride.h</Filename>
-    <Filename>PciPowerManagement.h</Filename>
-    <Filename>PciPowerManagement.c</Filename>
-    <Filename>PciDriverOverride.c</Filename>
-    <Filename>PciOptionRomSupport.c</Filename>
-    <Filename>PciEnumerator.c</Filename>
-    <Filename>PciEnumeratorSupport.c</Filename>
-    <Filename>PciResourceSupport.c</Filename>
-    <Filename>PciCommand.c</Filename>
-    <Filename>ComponentName.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>PciDeviceSupport.c</Filename>
-    <Filename>pcibus.c</Filename>
-    <Filename>PciIo.c</Filename>
-    <Filename>PciLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="2759ded5-bb57-4b06-af4f-c398fa552719"/>
-    <Package PackageGuid="BA0D78D6-2CAF-414b-BD4D-B6762A894288"/>
-    <Package PackageGuid="88894582-7553-4822-B484-624E24B6DECF"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciPlatformProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciHostBridgeResourceAllocationProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciHotPlugInitProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiPciHotPlugRequestProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <SystemTables>
-    <SystemTableCNames Usage="ALWAYS_CONSUMED">
-      <SystemTableCName>gEfiUgaIoProtocolGuid</SystemTableCName>
-    </SystemTableCNames>
-    <SystemTableCNames Usage="SOMETIMES_CONSUMED">
-      <SystemTableCName>gEfiPciOptionRomTableGuid</SystemTableCName>
-    </SystemTableCNames>
-  </SystemTables>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="PRIVATE">
-      <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PciBusEntryPoint</ModuleEntryPoint>
-    </Extern>
-    <Extern>
-      <DriverBinding>gPciBusDriverBinding</DriverBinding>
-      <ComponentName>gPciBusComponentName</ComponentName>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdPciIsaEnable</C_Name>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This is a switch to enable ISA</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPciIncompatibleDeviceSupportMask</C_Name>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The PCD masks for PCI incompatible devices support.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdPciVgaEnable</C_Name>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Whether VGA decoding is enabled on this platform so we should avoid those aliased resources</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.msa b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.msa
deleted file mode 100644
index 4ca5c313c0..0000000000
--- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.msa
+++ /dev/null
@@ -1,59 +0,0 @@
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>VgaMiniPort</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>15C5E761-58D8-461a-9173-CAB020916264</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component name for module VgaMiniPort</Abstract>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>VgaMiniPort</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>VgaMiniPort.h</Filename>
-    <Filename>VgaMiniPort.c</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PciVgaMiniPortDriverEntryPoint</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.msa b/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.msa
deleted file mode 100644
index ee0d635a02..0000000000
--- a/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.msa
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeReportStatusCodeLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>1DE0B8C2-FFB6-4bdf-97F5-0FFB33979038</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>DXE report status code library</Abstract>
-    <Description>Retrieve status code and report status code in DXE phase</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseReportStatusCodeLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="BASE">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BaseReportStatusCodeLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Progress Code, Error Code and Debug Code.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.msa b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.msa
deleted file mode 100644
index dc64709f01..0000000000
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.msa
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BaseUefiTianoCustomDecompressLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>d774c4d9-c121-4da3-a5e2-0f317e3c630c</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Uefi Tiano Decomression Library</Abstract>
-    <Description>Uefi Decompression library instance</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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseUefiTianoDecompressLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>UefiDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>CustomDecompressLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BaseUefiTianoCustomDecompressLib.c</Filename>
-    <Filename>BaseUefiTianoCustomDecompressLibInternals.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.msa b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.msa
deleted file mode 100644
index ac8d57f519..0000000000
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.msa
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeReportStatusCodeLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>3ddc3b12-99ea-4364-b315-6310a2050be5</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>DXE report status code library</Abstract>
-    <Description>Retrieve status code and report status code in DXE phase</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeReportStatusCodeLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ReportStatusCodeLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Progress Code, Error Code and Debug Code.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.msa b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.msa
deleted file mode 100644
index 7bab91228a..0000000000
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.msa
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>EdkGraphicsLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>08c1a0e4-1208-47f8-a2c5-f42eabee653a</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Graphics Library for UEFI drivers</Abstract>
-    <Description>This library provides supports for basic graphic functions.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EdkGraphicsLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>EdkGraphicsLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Graphics.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiOEMBadgingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.msa b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.msa
deleted file mode 100644
index 40e4561c5f..0000000000
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.msa
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>EdkOemHookStatusCodeLibNull</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>54D2878F-25CD-4a2b-8420-EBD18E609C76</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Memory Status Code Library for UEFI drivers</Abstract>
-    <Description>Lib to provide memory journal status code reporting Routines</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EdkOemHookStatusCodeLibNull</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>OemHookStatusCodeLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>OemHookStatusCodeLibNull.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.msa b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.msa
deleted file mode 100644
index 4807dcbb1b..0000000000
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.msa
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>EdkPciIncompatibleDeviceSuppportLib</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>1ca1c1f9-5baf-4204-b6e5-5e24109a4e4e</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>PCI Incompatible device support Library</Abstract>
-    <Description>Check PCI incompatible devices and set necessary configuration</Description>
-    <Copyright>Copyright (c) 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>EdkPciIncompatibleDeviceSupportLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>PciIncompatibleDeviceSupportLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PciIncompatibleDeviceSupportLib.c</Filename>
-    <Filename>IncompatiblePciDeviceList.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
deleted file mode 100644
index cd0052e0ef..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiDxeDebugLibReportStatusCode</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>bda39d3a-451b-4350-8266-81ab10fa0523</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Debug Library based on report status code library</Abstract>
-    <Description>Debug Library for PEIMs and DXE drivers that send debug messages to ReportStatusCode</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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiDxeDebugLibReportStatusCode</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER PEIM PEI_CORE UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DebugLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugPropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
deleted file mode 100644
index c58ecb363c..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiReportStatusCodeLib</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>8c690838-7a22-45c4-aa58-a33e3e515cd4</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Report status code library</Abstract>
-    <Description>ReportStatusCodeLib for PEIM which depends upon Pei Services table</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiReportStatusCodeLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ReportStatusCodeLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Progress Code, Error Code and Debug Code.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.msa b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.msa
deleted file mode 100644
index b5d6a262d6..0000000000
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.msa
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>SmmRuntimeDxeReportStatusCodeLibFramework</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>D65D9F72-7BCE-4f73-A673-47AF446A1A31</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>DXE report status code library</Abstract>
-    <Description>Retrieve status code and report status code in DXE phase</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeReportStatusCodeLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>ReportStatusCodeLib.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Progress Code, Error Code and Debug Code.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.msa b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.msa
deleted file mode 100644
index b4c87b3a23..0000000000
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.msa
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>VgaClass</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>BF89F10D-B205-474f-96E3-7A7BB1B4A407</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for VgaClass module.</Abstract>
-    <Description>This driver produces a VGA console.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved.
-    Copyright (c) 2006 - 2007, 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.  </License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>VgaClass</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverModelLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DevicePathLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>VgaClass.c</Filename>
-    <Filename>VgaClass.h</Filename>
-    <Filename>ComponentName.h</Filename>
-    <Filename>ComponentName.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-    <Package PackageGuid="bea835f9-fd62-464a-81ff-f3a806360c6b"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiVgaMiniPortProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <DriverBinding>gVgaClassDriverBinding</DriverBinding>
-      <ComponentName>gVgaClassComponentName</ComponentName>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.msa b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.msa
deleted file mode 100644
index d51f6063d5..0000000000
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.msa
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DataHub</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>53BCC14F-C24F-434C-B294-8ED2D4CC1860</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for DataHub module.</Abstract>
-    <Description>This driver initializes and installs the Data Hub protocol.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DataHub</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DataHub.c</Filename>
-    <Filename>DataHub.h</Filename>
-    <Filename>DataHub.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="2759ded5-bb57-4b06-af4f-c398fa552719"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>DataHubInstall</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.msa b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.msa
deleted file mode 100644
index b1d4c6114d..0000000000
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.msa
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DataHubStdErr</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
-    <GuidValue>CA515306-00CE-4032-874E-11B755FF6866</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Data Hub filter driver.</Abstract>
-    <Description>This driver takes DEBUG () info from Data Hub and writes it to StdErr if it exists.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DataHubStdErr</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DataHubStdErr.c</Filename>
-    <Filename>DataHubStdErr.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageGuid="2759ded5-bb57-4b06-af4f-c398fa552719"/>
-    <Package PackageGuid="88894582-7553-4822-B484-624E24B6DECF"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <DataHubs>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">
-      <DataHubCName>DATA_HUB_STATUS_CODE_DATA_RECORD</DataHubCName>
-      <HelpText>DEBUG() data that is recorded in status code data hub will be sent to Standard Error.</HelpText>
-    </DataHubRecord>
-  </DataHubs>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiStatusCodeGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>DataHubStdErrInitialize</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/SingleSegmentPciCfgPei.msa b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/SingleSegmentPciCfgPei.msa
deleted file mode 100644
index 3afa8b4e66..0000000000
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/SingleSegmentPciCfgPei.msa
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PciCfg</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>27A5159D-5E61-4809-919A-422E887101EF</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Single Segment Pci Configuration PPI</Abstract>
-    <Description>This file declares PciCfg PPI used to access PCI configuration space in PEI</Description>
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>
-      Copyright (c) 2006 - 2007, 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.
-    </License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PciCfg</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PciLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PciCfg.dxs</Filename>
-    <Filename>PciCfg.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>gEfiPciCfgPpiInServiceTableGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeimInitializePciCfg</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
deleted file mode 100644
index 5935bdd8f5..0000000000
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>DxeStatusCode</ModuleName>
-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <GuidValue>FEDE0A1B-BCA2-4A9F-BB2B-D9FD7DEC2E9F</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>DXE status code driver.</Abstract>
-    <Description>
-      Status Code Architectural Protocol implementation as defined in Tiano
-      Architecture Specification. This driver has limited functionality 
-      at runtime and will not log to Data Hub at runtime.
-    </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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>DxeStatusCode</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>SerialPortLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>OemHookStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
-      <Keyword>EdkDxeSalLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DxeStatusCode.h</Filename>
-    <Filename>DxeStatusCode.c</Filename>
-    <Filename>DataHubStatusCodeWorker.c</Filename>
-    <Filename>RtMemoryStatusCodeWorker.c</Filename>
-    <Filename>SerialStatusCodeWorker.c</Filename>
-    <Filename SupArchList="IA32">Common/DxeStatusCodeCommon.c</Filename>
-    <Filename SupArchList="IA32">Common/StatusCode.dxs</Filename>
-    <Filename SupArchList="X64">Common/DxeStatusCodeCommon.c</Filename>
-    <Filename SupArchList="X64">Common/StatusCode.dxs</Filename>
-    <Filename SupArchList="EBC">Common/DxeStatusCodeCommon.c</Filename>
-    <Filename SupArchList="EBC">Common/StatusCode.dxs</Filename>
-    <Filename SupArchList="IPF">Ipf/DxeStatusCodeIpf.c</Filename>
-    <Filename SupArchList="IPF">Ipf/StatusCode.dxs</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5E0E9358-46B6-4AE2-8218-4AB8B9BBDCEC"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiExtendedSalStatusCodeServicesProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <Guids> 
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gMemoryStatusCodeRecordGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiStatusCodeDataTypeStringGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiStatusCodeGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>DxeStatusCodeDriverEntry</ModuleEntryPoint>
-    </Extern>
-    <Extern>
-      <SetVirtualAddressMapCallBack>VirtualAddressChangeCallBack</SetVirtualAddressMapCallBack>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseHardSerial</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseEfiSerial</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseRuntimeMemory</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseDataHub</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseOEM</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeReplayInSerial</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeReplayInDataHub</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeReplayInRuntimeMemory</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeReplayInOEM</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdStatusCodeRuntimeMemorySize</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
deleted file mode 100644
index d0cd00d7fa..0000000000
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiStatusCode</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>1EC0F53A-FDE0-4576-8F25-7A1A410F58EB</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Generic Status code Pei driver</Abstract>
-    <Description>Customized output devices based on feature flags.</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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiStatusCode</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>ReportStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>SerialPortLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>OemHookStatusCodeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>PeiStatusCode.h</Filename>
-    <Filename>SerialStatusCodeWorker.c</Filename>
-    <Filename>MemoryStausCodeWorker.c</Filename>
-    <Filename>PeiStatusCode.c</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiPeiStatusCodePpiGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gMemoryStatusCodeRecordGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeiStatusCodeDriverEntry</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseSerial</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseMemory</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdStatusCodeUseOEM</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdStatusCodeMemorySize</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText/>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.msa b/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.msa
deleted file mode 100644
index 565ae31a13..0000000000
--- a/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.msa
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>PeiVariable</ModuleName>
-    <ModuleType>PEIM</ModuleType>
-    <GuidValue>34C8C28F-B61C-45a2-8F2E-89E46BECC63B</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for PeiVariable module.</Abstract>
-    <Description>Framework PEIM to provide the Variable functionality.</Description>
-    <Copyright>Copyright (c) 2006 - 2007, 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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>PeiVariable</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeimEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>HobLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>Variable.h</Filename>
-    <Filename>Variable.c</Filename>
-    <Filename>Variable.dxs</Filename>
-    <Filename SupArchList="IA32 X64 EBC">VariableWorker.c</Filename>
-    <Filename SupArchList="IPF">Ipf/VariableWorker.c</Filename>
-    <Filename SupArchList="IA32">Ia32/VarMachine.h</Filename>
-    <Filename SupArchList="EBC">Ebc/VarMachine.h</Filename>
-    <Filename SupArchList="X64">x64/VarMachine.h</Filename>
-    <Filename SupArchList="IPF">Ipf/VarMachine.h</Filename>
-  </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
-  </PackageDependencies>
-  <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>gEfiPeiReadOnlyVariablePpiGuid</PpiCName>
-    </Ppi>
-  </PPIs>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>PeimInitializeVariableServices</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdFlashNvStorageVariableBase</C_Name>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to
-        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
-\ No newline at end of file