diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 5f649b5dde..44962de89d 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -173,11 +173,7 @@
   ## This protocol provides the interfaces to Get/Set the current video mode for GOP/UGA screen
   ## Include/Protocol/ConsoleControl.h
   gEfiConsoleControlProtocolGuid = { 0xF42F7782, 0x012E, 0x4C12, { 0x99, 0x56, 0x49, 0xF9, 0x43, 0x04, 0xF7, 0x21 }}
-  
-  ## OEM Badging Protocol defines the interface to get the OEM badging image with the dispaly attribute.
-  ## Include/Protocol/OEMBadging.h
-  gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}
-    
+      
   ## Include/Protocol/NicIp4Config.h
   gEfiNicIp4ConfigProtocolGuid   = {0xdca3d4d, 0x12da, 0x4728,  { 0xbf, 0x7e, 0x86, 0xce, 0xb9, 0x28, 0xd0, 0x67 }}
   
@@ -249,9 +245,6 @@
   #  It can be set according to the generated image section type.
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|TRUE|BOOLEAN|0x00010044
   
-  ## If PcdSupportHardwareErrorRecord is TRUE, support hardware error record via variable in BDS.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHardwareErrorRecord|FALSE|BOOLEAN|0x00010045
-  
   ## If TRUE, Robustnesss improvement such as for DUET. Default is not required.
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|FALSE|BOOLEAN|0x00010047
 
@@ -259,8 +252,9 @@
   #  FALSE is for size reduction.
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol|TRUE|BOOLEAN|0x00010100
   
-  ## If TRUE, Full UEFI Config Routing Protocol will be installed.
-  #  FALSE is for size reduction.
+  ## If TRUE, these interface in EFI_HII_CONFIG_ROUTING_PROTOCOL will be supported: ExtractConfig, ExportConfig, RouteConfig 
+  # and GetAltCfg will be supported. Otherwise, these interfaces will return EFI_UNSUPPORTED.
+  # FALSE is for size reduction.
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportFullConfigRoutingProtocol|TRUE|BOOLEAN|0x00010101
   
   ## If TRUE, USB KeyBoard Driver disables the default keyboard layout.
@@ -335,41 +329,14 @@
     
   ## Size of the FTW working block range.
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011
-
-[PcdsFixedAtBuild.IA32]
-  ## Default EFI boot path name for IA32 architecture, this path is relative to 
-  #  EFI boot disk.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName|L"\EFI\BOOT\BOOTIA32.EFI"|VOID*|0x40000003
-
-[PcdsFixedAtBuild.X64]
-  ## Default EFI boot path name for X64 architecture, this path is relative to 
-  #  EFI boot disk.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName|L"\EFI\BOOT\BOOTX64.EFI"|VOID*|0x40000003
-
-[PcdsFixedAtBuild.IPF]
-  ## Default EFI boot path name for IPF architecture, this path is relative to 
-  #  EFI boot disk.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName|L"\EFI\BOOT\BOOTIA64.EFI"|VOID*|0x40000003
-
-[PcdsFixedAtBuild.EBC]
-  ## Default EFI boot path name for EBC architecture, this path is relative to 
-  #  EFI boot disk.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName|L"\EFI\BOOT\BOOTEBC.EFI"|VOID*|0x40000003
-   
-[PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]
-  ## Default timeout value for displaying progressing bar in before boot OS.
-  #  This value can be changed in BDS.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001  
-  
+ 
+[PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]  
   ##
   #  This PCD defines the times to print hello world string.
   #  This PCD is a sample to explain FixedAtBuild UINT32 PCD usage.
   ##
   gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintTimes|1|UINT32|0x40000005
-  
-  ## Error level for hardware recorder.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|1|UINT16|0x40000002 
-  
+
 [PcdsFixedAtBuild,PcdsPatchableInModule]
   ## Maximun number of performance log entries during PEI phase.
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|40|UINT8|0x0001002f