diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index c820656838..95783cd365 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -93,194 +93,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMassStorage" />
       
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMouse" />
-      <!-- X64 -->
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="HelloWorld" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Partition" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="English" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIoPartition" />
-      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SecurityStub" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeMain" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMain" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeIpl" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="GraphicsConsole" />
-      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Runtime" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="MonotonicCounter" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Variable" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="EmuVariable" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="StatusCode" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" />
-      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiVariable" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="WatchDogTimer" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="FtwLite" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DebugPort" />
-      <!--
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DebugSupport" />
-      -->
-
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Terminal" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DataHub" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DataHubStdErr" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="NullMemoryTest" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="HiiDatabase" />
-      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ConSplitter" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BC" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Dhcp4" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SNP" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Ebc" />
-      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SetupBrowser" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DriverSample" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PciBus" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="AtapiPassThru" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" />
-      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="IdeBus" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Uhci" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ScsiBus" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ScsiDisk" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbBot" />
-      
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbBus" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbCbi0" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbCbi1" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbKb" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbMassStorage" />
-
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbMouse" />
-      <!-- IFP -->
-
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="HelloWorld" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Partition" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="English" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIoPartition" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SecurityStub" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeMain" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMain" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeIpl" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="GraphicsConsole" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Runtime" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="MonotonicCounter" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Variable" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="EmuVariable" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="StatusCode" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiVariable" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="WatchDogTimer" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="FtwLite" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DebugPort" />
-
-      <!--
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DebugSupport" />
-      -->
-
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Terminal" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DataHub" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DataHubStdErr" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="NullMemoryTest" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="HiiDatabase" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ConSplitter" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BC" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Dhcp4" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SNP" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Ebc" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SetupBrowser" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DriverSample" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PciBus" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="AtapiPassThru" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="IdeBus" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Uhci" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ScsiBus" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ScsiDisk" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbBot" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbBus" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbCbi0" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbCbi1" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbKb" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbMassStorage" />
-      
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbMouse" />
-
-      <!-- EBC -->
-
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="HelloWorld" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Partition" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="English" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIo" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIoPartition" />
-      
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SecurityStub" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeMain" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMain" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeIpl" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="GraphicsConsole" />
-
-      <!-- Not Support 
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Runtime" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="MonotonicCounter" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Variable" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="EmuVariable" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="StatusCode" />
-      -->
-
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" />
-      
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiVariable" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="WatchDogTimer" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="FtwLite" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DebugPort" />
-
-      <!--
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DebugSupport" />
-      -->
-
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Terminal" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DataHub" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DataHubStdErr" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="NullMemoryTest" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="HiiDatabase" />
-      
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ConSplitter" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BC" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Dhcp4" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SNP" />
-
-      <!--
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Ebc" />
-      -->
-
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SetupBrowser" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DriverSample" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PciBus" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="AtapiPassThru" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" />
-
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="IdeBus" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Uhci" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ScsiBus" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ScsiDisk" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbBot" />
-      
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbBus" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbCbi0" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbCbi1" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbKb" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbMassStorage" />
-      
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbMouse" />
     </OTHER_COMPONENTS>
   </TianoImage>
   <PcdBuildDeclarations>