diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index a36dc938bd..1f09fa383f 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
@@ -274,12 +274,6 @@ Returns:
   EFI_RUNTIME_IMAGE_ENTRY       *RuntimeImage;
   LIST_ENTRY                    *Link;
   EFI_PHYSICAL_ADDRESS          VirtImageBase;
-  UINTN                         Index;
-  UINTN                         Index1;
-  UINTN                         Index2;
-  UINTN                         Index3;
-  EFI_CAPSULE_TABLE             *CapsuleTable; 
-  EFI_CAPSULE_INFO_TABLE        *CapsuleInfoTable; 
 
   //
   // Can only switch to virtual addresses once the memory map is locked down,
@@ -372,44 +366,8 @@ Returns:
   RuntimeDriverCalculateEfiHdrCrc (&gRT->Hdr);
 
   //
-  // BugBug: PI requires System Configuration Tables Conversion.
-  // Currently, we do not implement it.
-  //
-  for (Index = 0; Index < gST->NumberOfTableEntries; Index++) {
-    //
-    // CapsuleInfoGuid in ConfigTable refers to an array of CapsuleGuid, it is information
-    // from which you can tell which vendorGuids in ConfigTable are related to CapsuleTable.
-    // Each CapsuleTable points to a array of capsules across a system reset. Then convert 
-    // the array contents to make these capsules visiable in Runtime.
-    //
-
-    //
-    // Firstly, Get CapsulInfoGuid in ConfigTable, it points to CapsuleInfoTable, which
-    // gather all the installed capsules' guids.
-    //
-    if (CompareGuid (&gEfiCapsuleInfoGuid, &(gST->ConfigurationTable[Index].VendorGuid))) {
-      CapsuleInfoTable = gST->ConfigurationTable[Index].VendorTable;
-      //
-      // For each known CapsuleGuid in CapsuleInfoTable, loop the whole ConfigTable to
-      // find out this guid related to CapsuleTable.
-      //
-      for (Index1 = 0; Index1 < CapsuleInfoTable->CapsuleGuidNumber; Index1++) {
-        for (Index2 = 0; Index2 < gST->NumberOfTableEntries; Index2++) {
-          //
-          // Find out certain CapsuleTable, go through its contents array, and convert them.
-          //
-          if (CompareGuid (&CapsuleInfoTable->CapsuleGuidPtr[Index1], &(gST->ConfigurationTable[Index2].VendorGuid))) {
-            CapsuleTable = gST->ConfigurationTable[Index2].VendorTable;
-            for (Index3 = 0; Index3 < CapsuleTable->CapsuleArrayNumber; Index3++) {
-              RuntimeDriverConvertInternalPointer ((VOID **) &CapsuleTable->CapsulePtr[Index3]);
-            }     
-            RuntimeDriverConvertInternalPointer ((VOID **) &(gST->ConfigurationTable[Index2].VendorTable));
-          }
-        }
-      }
-      break;
-    }
-  }
+  // UEFI don't require System Configuration Tables Conversion.
+  // 
 
   //
   // Convert the runtime fields of the EFI System Table and recompute the CRC-32
diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index f9e4f1d375..0078da2b91 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -25,7 +25,6 @@ Abstract:
 #define _RUNTIME_H_
 
 #include <PiDxe.h>
-#include <Guid/CapsuleInfo.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/Runtime.h>
 #include <Library/BaseLib.h>
diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
index 8519cc84fb..943e6c0fd6 100644
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
@@ -38,7 +38,6 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
   PeCoffLib
@@ -51,9 +50,6 @@
   UefiDriverEntryPoint
   BaseLib
 
-[Guids]
-  gEfiCapsuleInfoGuid
-
 [Protocols]
   gEfiRuntimeArchProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED
   gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED