diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
index 7f7a9a1982..8e16763597 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
@@ -343,31 +343,4 @@ InitializePrivateData (
   return EFI_SUCCESS;
 }
 
-/**
-  Return if this FMP is a system FMP or a device FMP, based upon FmpImageInfo.
 
-  @param[in] FmpImageInfo A pointer to EFI_FIRMWARE_IMAGE_DESCRIPTOR
-
-  @retval TRUE  It is a system FMP.
-  @retval FALSE It is a device FMP.
-**/
-BOOLEAN
-IsSystemFmp (
-  IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *FmpImageInfo
-  )
-{
-  GUID      *Guid;
-  UINTN     Count;
-  UINTN     Index;
-
-  Guid = PcdGetPtr(PcdSystemFmpCapsuleImageTypeIdGuid);
-  Count = PcdGetSize(PcdSystemFmpCapsuleImageTypeIdGuid) / sizeof(GUID);
-
-  for (Index = 0; Index < Count; Index++, Guid++) {
-    if (CompareGuid(&FmpImageInfo->ImageTypeId, Guid)) {
-      return TRUE;
-    }
-  }
-
-  return FALSE;
-}
diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
index 999b2b2501..cd6601e815 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
@@ -36,7 +36,6 @@
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/DevicePathLib.h>
 #include <Library/HobLib.h>
-#include <Library/DxeServicesLib.h>
 #include <Library/DxeServicesTableLib.h>
 #include <Library/PlatformFlashAccessLib.h>
 #include <Library/EdkiiSystemCapsuleLib.h>
diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
index cc9614ef14..b15736cf0d 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
@@ -50,9 +50,7 @@
   HobLib
   UefiRuntimeServicesTableLib
   UefiDriverEntryPoint
-  DxeServicesLib
   DxeServicesTableLib
-  PrintLib
   EdkiiSystemCapsuleLib
 
 [Pcd]
diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
index 2695fb6eb5..7ddea3679e 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
@@ -51,7 +51,6 @@
   HobLib
   UefiRuntimeServicesTableLib
   UefiDriverEntryPoint
-  DxeServicesLib
   EdkiiSystemCapsuleLib
   PlatformFlashAccessLib
   IniParsingLib