diff --git a/MdePkg/Include/Library/OldPeiCoreEntryPoint.h b/MdePkg/Include/Library/OldPeiCoreEntryPoint.h
deleted file mode 100644
index b9d2ac7233..0000000000
--- a/MdePkg/Include/Library/OldPeiCoreEntryPoint.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/** @file
- Entry point to the PEI Core
-
-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.
-
-**/
-
-#ifndef __MODULE_ENTRY_POINT_H__
-#define __MODULE_ENTRY_POINT_H__
-
-/**
-
- Enrty point to PEI core.
-
- @param SecCoreData Points to a data structure containing
- information about the PEI core's
- operating environment, such as the size
- and location of temporary RAM, the stack
- location and the BFV location. The type
- EFI_SEC_PEI_HAND_OFF is
-
- @param PpiList Points to a list of one or more PPI
- descriptors to be installed initially by
- the PEI core. An empty PPI list consists
- of a single descriptor with the end-tag
- EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST.
- As part of its initialization phase, the
- PEI Foundation will add these SEC-hosted
- PPIs to its PPI database such that both
- the PEI Foundation and any modules can
- leverage the associated service calls
- and/or code in these early PPIs.
-
-**/
-EFI_STATUS
-EFIAPI
-_ModuleEntryPoint (
- IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor
- );
-
-/**
- Wrapper of enrty point to PEI core.
-
- @param PeiStartupDescriptor Pointer of start up information.
-
- @return Status returned by entry points of core and drivers.
-
-**/
-EFI_STATUS
-EFIAPI
-EfiMain (
- IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor
- );
-
-/**
- Call constructs for all libraries. Automatics Generated by tool.
-
- @param FfsHeader Pointer to header of FFS.
- @param PeiServices Pointer to the PEI Services Table.
-
-**/
-VOID
-EFIAPI
-ProcessLibraryConstructorList (
- IN EFI_FFS_FILE_HEADER *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
- );
-
-
-/**
- Call the list of driver entry points. Automatics Generated by tool.
-
- @param PeiStartupDescriptor Pointer to startup information .
- @param OldCoreData Pointer to Original startup information.
-
- @return Status returned by entry points of drivers.
-
-**/
-EFI_STATUS
-EFIAPI
-ProcessModuleEntryPointList (
- IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor,
- IN VOID *OldCoreData
- );
-
-#endif
diff --git a/MdePkg/Library/OldPeiCoreEntryPoint/OldPeiCoreEntryPoint.inf b/MdePkg/Library/OldPeiCoreEntryPoint/OldPeiCoreEntryPoint.inf
deleted file mode 100644
index 32aef3447c..0000000000
--- a/MdePkg/Library/OldPeiCoreEntryPoint/OldPeiCoreEntryPoint.inf
+++ /dev/null
@@ -1,41 +0,0 @@
-#/** @file
-# Entry point to a the PEI Core
-#
-# The library contains the entry point to a PEI core Module Type.
-# Copyright (c) 2007, 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 = PeiCoreEntryPoint
- FILE_GUID = 7AA626A3-238A-4c4c-9313-E9F937A744F0
- MODULE_TYPE = PEI_CORE
- VERSION_STRING = 1.0
- LIBRARY_CLASS = OldPeiCoreEntryPoint|PEI_CORE
- EDK_RELEASE_VERSION = 0x00020000
- EFI_SPECIFICATION_VERSION = 0x00020000
-
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 IPF EBC
-#
-
-[Sources.common]
- PeiCoreEntryPoint.c
-
-
-
-[Packages]
- MdePkg/MdePkg.dec
-
diff --git a/MdePkg/Library/OldPeiCoreEntryPoint/PeiCoreEntryPoint.c b/MdePkg/Library/OldPeiCoreEntryPoint/PeiCoreEntryPoint.c
deleted file mode 100644
index 4967a37c51..0000000000
--- a/MdePkg/Library/OldPeiCoreEntryPoint/PeiCoreEntryPoint.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/** @file
- Entry point to a the PEI Core.
-
-Copyright (c) 2006 - 2007, 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.
-
-**/
-
-
-#include
-
-//
-// The Library classes this module produced
-//
-#include
-
-/**
-
- Enrty point to PEI core.
-
- @param SecCoreData Points to a data structure containing
- information about the PEI core's
- operating environment, such as the size
- and location of temporary RAM, the stack
- location and the BFV location. The type
- EFI_SEC_PEI_HAND_OFF is
-
- @param PpiList Points to a list of one or more PPI
- descriptors to be installed initially by
- the PEI core. An empty PPI list consists
- of a single descriptor with the end-tag
- EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST.
- As part of its initialization phase, the
- PEI Foundation will add these SEC-hosted
- PPIs to its PPI database such that both
- the PEI Foundation and any modules can
- leverage the associated service calls
- and/or code in these early PPIs.
-
-**/
-EFI_STATUS
-EFIAPI
-_ModuleEntryPoint(
- IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor
-)
-{
- return ProcessModuleEntryPointList (PeiStartupDescriptor, NULL);
-}
-
-
-/**
-
- Wrapper of enrty point to PEI core.
-
- @param SecCoreData Points to a data structure containing
- information about the PEI core's
- operating environment, such as the size
- and location of temporary RAM, the stack
- location and the BFV location. The type
- EFI_SEC_PEI_HAND_OFF is
-
- @param PpiList Points to a list of one or more PPI
- descriptors to be installed initially by
- the PEI core. An empty PPI list consists
- of a single descriptor with the end-tag
- EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST.
- As part of its initialization phase, the
- PEI Foundation will add these SEC-hosted
- PPIs to its PPI database such that both
- the PEI Foundation and any modules can
- leverage the associated service calls
- and/or code in these early PPIs.
-
-**/
-EFI_STATUS
-EFIAPI
-EfiMain (
- IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor
- )
-{
- return _ModuleEntryPoint (PeiStartupDescriptor);
-}
diff --git a/MdePkg/Library/OldPeiCoreEntryPoint/PeiCoreEntryPoint.msa b/MdePkg/Library/OldPeiCoreEntryPoint/PeiCoreEntryPoint.msa
deleted file mode 100644
index 1359da2b7a..0000000000
--- a/MdePkg/Library/OldPeiCoreEntryPoint/PeiCoreEntryPoint.msa
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- PeiCoreEntryPoint
- PEI_CORE
- 7AA626A3-238A-4c4c-9313-E9F937A744F0
- 1.0
- Entry point to a the PEI Core
- The library contains the entry point to a PEI core Module Type.
- Copyright (c) 2006 - 2007, 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 IPF EBC
- false
- PeiCoreEntryPoint
-
-
-
- PeiCoreEntryPoint
-
-
-
- PeiCoreEntryPoint.c
-
-
-
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
-
\ No newline at end of file
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index d000873535..1e7294e6cc 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -59,7 +59,6 @@
PeiServicesLib|Include/Library/PeiServicesLib.h
PeimEntryPoint|Include/Library/PeimEntryPoint.h
PeiCoreEntryPoint|Include/Library/PeiCoreEntryPoint.h
- OldPeiCoreEntryPoint|Include/Library/OldPeiCoreEntryPoint.h
PeCoffLib|Include/Library/PeCoffLib.h
PeCoffGetEntryPointLib|Include/Library/PeCoffGetEntryPointLib.h
PciSegmentLib|Include/Library/PciSegmentLib.h