diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
index e4a7485fef..d2b6a43cdc 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
+++ b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
@@ -87,7 +87,6 @@
   gEdkiiPeiShadowMicrocodePpiGuid        ## SOMETIMES_CONSUMES
 
 [Guids]
-  gEdkiiS3SmmInitDoneGuid
   gEdkiiMicrocodePatchHobGuid
   gGhcbApicIdsGuid                       ## SOMETIMES_CONSUMES
   gEdkiiEndOfS3ResumeGuid
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
index 16a858d542..495dc108b2 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
@@ -14,68 +14,6 @@
 
 STATIC UINT64  mSevEsPeiWakeupBuffer = BASE_1MB;
 
-/**
-  S3 SMM Init Done notification function.
-
-  @param  PeiServices      Indirect reference to the PEI Services Table.
-  @param  NotifyDesc       Address of the notification descriptor data structure.
-  @param  InvokePpi        Address of the PPI that was invoked.
-
-  @retval EFI_SUCCESS      The function completes successfully.
-
-**/
-EFI_STATUS
-EFIAPI
-NotifyOnS3SmmInitDonePpi (
-  IN  EFI_PEI_SERVICES           **PeiServices,
-  IN  EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
-  IN  VOID                       *InvokePpi
-  );
-
-//
-// Global function
-//
-EFI_PEI_NOTIFY_DESCRIPTOR  mS3SmmInitDoneNotifyDesc = {
-  EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
-  &gEdkiiS3SmmInitDoneGuid,
-  NotifyOnS3SmmInitDonePpi
-};
-
-/**
-  S3 SMM Init Done notification function.
-
-  @param  PeiServices      Indirect reference to the PEI Services Table.
-  @param  NotifyDesc       Address of the notification descriptor data structure.
-  @param  InvokePpi        Address of the PPI that was invoked.
-
-  @retval EFI_SUCCESS      The function completes successfully.
-
-**/
-EFI_STATUS
-EFIAPI
-NotifyOnS3SmmInitDonePpi (
-  IN  EFI_PEI_SERVICES           **PeiServices,
-  IN  EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
-  IN  VOID                       *InvokePpi
-  )
-{
-  CPU_MP_DATA  *CpuMpData;
-
-  CpuMpData = GetCpuMpData ();
-
-  //
-  // PiSmmCpuDxeSmm driver hardcode change the loop mode to HLT mode.
-  // So in this notify function, code need to check the current loop
-  // mode, if it is not HLT mode, code need to change loop mode back
-  // to the original mode.
-  //
-  if (CpuMpData->ApLoopMode != ApInHltLoop) {
-    CpuMpData->WakeUpByInitSipiSipi = TRUE;
-  }
-
-  return EFI_SUCCESS;
-}
-
 /**
   Enable Debug Agent to support source debugging on AP function.
 
@@ -510,8 +448,6 @@ InitMpGlobalData (
   ///
   /// Install Notify
   ///
-  Status = PeiServicesNotifyPpi (&mS3SmmInitDoneNotifyDesc);
-  ASSERT_EFI_ERROR (Status);
 
   Status = PeiServicesNotifyPpi (&mEndOfS3ResumeNotifyDesc);
   ASSERT_EFI_ERROR (Status);