diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
index a55fb432e0..15736c6ca9 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
@@ -48,7 +48,6 @@ Returns:
   EFI_STATUS  Status;
   EFI_HANDLE  NewHandle;
 
-  EFI_DEADLOOP ();
   SystemTable->RuntimeServices->UpdateCapsule                    = UpdateCapsule;
   SystemTable->RuntimeServices->QueryCapsuleCapabilities         = QueryCapsuleCapabilities;
 
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index b80b8f7a24..b7b946e1fa 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -22,10 +22,6 @@
     <OutputFileBasename>CapsuleRuntime</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
index 202d6a3586..a7cb5f68c9 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
@@ -156,7 +156,6 @@ Returns:
 {
   EFI_STATUS  Status;
 
-  EFI_DEADLOOP ();
   Status = VariableCommonInitialize (ImageHandle, SystemTable);
   ASSERT_EFI_ERROR (Status);