diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
deleted file mode 100644
index 46fe3083b9..0000000000
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/** @file
- PEI Services Table Pointer Library.
-
- Copyright (c) 2006, Intel Corporation
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- Module Name: PeiServicesTablePointer.c
-
-**/
-
-
-#include
-
-
-#include
-#include
-#include
-#include
-#include
-
-VOID
-EFIAPI
-SetPeiServicesTablePointer (
- IN EFI_PEI_SERVICES **PeiServices
- )
-{
- AsmWriteMm7 ((UINT64)(UINTN)PeiServices);
-}
-
-/**
- The function returns the pointer to PeiServices.
-
- The function returns the pointer to PeiServices.
- It will ASSERT() if the pointer to PeiServices is NULL.
-
- @retval The pointer to PeiServices.
-
-**/
-EFI_PEI_SERVICES **
-EFIAPI
-GetPeiServicesTablePointer (
- VOID
- )
-{
- EFI_PEI_SERVICES **PeiServices;
-
- PeiServices = (EFI_PEI_SERVICES **)(UINTN)AsmReadMm7 ();
- ASSERT (PeiServices != NULL);
- return PeiServices;
-}
-
-/**
- The constructor function caches the pointer to PEI services.
-
- The constructor function caches the pointer to PEI services.
- It will always return EFI_SUCCESS.
-
- @param FfsHeader Pointer to FFS header the loaded driver.
- @param PeiServices Pointer to the PEI services.
-
- @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS.
-
-**/
-EFI_STATUS
-EFIAPI
-PeiServicesTablePointerLibConstructor (
- IN EFI_PEI_FILE_HANDLE *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
- )
-{
- AsmWriteMm7 ((UINT64)(UINTN)PeiServices);
- return EFI_SUCCESS;
-}
-
-/**
- After memory initialization in PEI phase, the IDT table in temporary memory should
- be migrated to memory, and the address of PeiServicesPointer also need to be updated
- immediately preceding the new IDT table.
-
- @param PeiServices The address of PeiServices pointer.
-**/
-VOID
-MigrateIdtTable (
- IN EFI_PEI_SERVICES **PeiServices
- )
-{
- UINTN Size;
- VOID *NewBase;
- EFI_STATUS Status;
- IA32_DESCRIPTOR Idtr;
-
- AsmReadIdtr (&Idtr);
-
- Size = Idtr.Limit + 1;
-
- Status = PeiServicesAllocatePool (Size, &NewBase);
- ASSERT_EFI_ERROR (Status);
-
- CopyMem (NewBase, (VOID*)Idtr.Base, Size);
-
- Idtr.Base = (UINTN)NewBase;
- AsmWriteIdtr (&Idtr);
-}
-
diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
deleted file mode 100644
index a0371843d1..0000000000
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
+++ /dev/null
@@ -1,48 +0,0 @@
-#/** @file
-# Component description file for MM7 Pei Services Table Pointer Library
-#
-# PEI Services Table Library implementation that retrieves a pointer to the PEI
-# Services Table from the MM7 on IA-32 and x64.
-# Copyright (c) 2006, Intel Corporation.
-#
-# All rights reserved. This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-#**/
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PeiServicesTablePointerLibMm7
- FILE_GUID = e6e9c1f8-2c8a-4f4b-a27c-c382e4bb8e67
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
- LIBRARY_CLASS = PeiServicesTablePointerLib|PEIM PEI_CORE SEC
- EDK_RELEASE_VERSION = 0x00020000
- EFI_SPECIFICATION_VERSION = 0x00020000
-
- CONSTRUCTOR = PeiServicesTablePointerLibConstructor
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64
-#
-
-[Sources.common]
- PeiServicesTablePointer.c
-
-
-[Packages]
- MdePkg/MdePkg.dec
-
-
-[LibraryClasses]
- DebugLib
- BaseLib
- BaseMemoryLib
- PeiServicesLib
diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
deleted file mode 100644
index 2e6d8fbe15..0000000000
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
- PeiServicesTablePointerLibMm7
- PEIM
- e6e9c1f8-2c8a-4f4b-a27c-c382e4bb8e67
- 1.0
- Component description file for MM7 Pei Services Table Pointer Library
- PEI Services Table Library implementation that retrieves a pointer to the PEI
- Services Table from the MM7 on IA-32 and x64.
- Copyright (c) 2006, Intel Corporation.
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- IA32 X64
- false
- PeiServicesTablePointerLibMm7
-
-
-
- PeiServicesTablePointerLib
-
-
- BaseLib
-
-
- DebugLib
-
-
-
- PeiServicesTablePointer.c
-
-
-
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
- PeiServicesTablePointerLibConstructor
-
-
-
\ No newline at end of file
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index f394a9d500..278fc3750f 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -114,7 +114,6 @@
MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
- MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
[Components.X64]
MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
@@ -123,7 +122,6 @@
MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
- MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
[Components.IPF]
MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf