diff --git a/MdeModulePkg/Core/Pei/Ipf/InternalSwitchStack.c b/MdeModulePkg/Core/Pei/Ipf/InternalSwitchStack.c
deleted file mode 100644
index 4e5df1a44a..0000000000
--- a/MdeModulePkg/Core/Pei/Ipf/InternalSwitchStack.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/** @file
-  SwitchStack() function for IPF.
-
-  Copyright (c) 2007, Intel Corporation<BR>
-  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 <PeiMain.h>
-
-VOID
-EFIAPI
-IpfAsmSwitchStack (
-    IN  SWITCH_STACK_ENTRY_POINT  EntryPoint,
-    IN  VOID                      *ConText1, OPTIONAL
-    IN  VOID                      *Context2, OPTIONAL
-    IN  VOID                      *Context3, OPTIONAL
-    IN  VOID                      *NewStack,
-    IN  VOID                      *NewBsp
-    );
-
-/**
-  Transfers control to a function starting with a new stack.
-
-  Transfers control to the function specified by EntryPoint using the
-  new stack specified by NewStack and passing in the parameters specified
-  by Context1 and Context2.  Context1 and Context2 are optional and may
-  be NULL.  The function EntryPoint must never return.
-  Marker will be ignored on IA-32, x64, and EBC.
-  IPF CPUs expect one additional parameter of type VOID * that specifies
-  the new backing store pointer.
-
-  If EntryPoint is NULL, then ASSERT().
-  If NewStack is NULL, then ASSERT().
-
-  @param  EntryPoint  A pointer to function to call with the new stack.
-  @param  Context1    A pointer to the context to pass into the EntryPoint
-                      function.
-  @param  Context2    A pointer to the context to pass into the EntryPoint
-                      function.
-  @param  NewStack    A pointer to the new stack to use for the EntryPoint
-                      function.
-  @param  Marker      VA_LIST marker for the variable argument list.
-
-**/
-VOID
-EFIAPI
-InternalSwitchStack (
-  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,   OPTIONAL
-  IN      VOID                      *Context2,   OPTIONAL
-  IN      VOID                      *Context3,   OPTIONAL
-  IN      VOID                      *NewStack,
-  IN      VA_LIST                   Marker
-  )
-
-{
-  VOID                      *NewBsp;
-
-  //
-  // Get new backing store pointer from variable list
-  //
-  NewBsp   = VA_ARG (Marker, VOID *);
-
-  //
-  // Stack should be aligned with CPU_STACK_ALIGNMENT
-  //
-  ASSERT (((UINTN)NewStack & (CPU_STACK_ALIGNMENT - 1)) == 0);
-  ASSERT (((UINTN)NewBsp & (CPU_STACK_ALIGNMENT - 1)) == 0);
-
-  IpfAsmSwitchStack (EntryPoint, Context1, Context2, Context3, NewStack, NewBsp);
-}
diff --git a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.i b/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.i
deleted file mode 100644
index c8a209debc..0000000000
--- a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.i
+++ /dev/null
@@ -1,93 +0,0 @@
-//++
-// 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:
-//  
-//   IpfCpuCore.i
-//
-// Abstract:
-//   IPF CPU definitions
-//
-//--
-
-#ifndef _IPF_CPU_CORE_
-#define _IPF_CPU_CORE_
-
-#define  PEI_BSP_STORE_SIZE                     0x4000
-#define  ResetFn                                0x00
-#define  MachineCheckFn                         0x01
-#define  InitFn                                 0x02
-#define  RecoveryFn                             0x03
-#define  GuardBand                              0x10 
-
-//
-// Define hardware RSE Configuration Register
-//
-
-//
-// RS Configuration (RSC) bit field positions
-//
-#define RSC_MODE       0
-#define RSC_PL         2
-#define RSC_BE         4
-//
-// RSC bits 5-15 reserved
-//
-#define RSC_MBZ0       5
-#define RSC_MBZ0_V     0x3ff
-#define RSC_LOADRS     16
-#define RSC_LOADRS_LEN 14
-//
-// RSC bits 30-63 reserved
-//
-#define RSC_MBZ1       30
-#define RSC_MBZ1_V     0x3ffffffffULL
-
-//
-// RSC modes
-//
-
-//
-// Lazy
-//
-#define RSC_MODE_LY (0x0)
-//
-// Store intensive
-//
-#define RSC_MODE_SI (0x1)
-//
-// Load intensive
-//
-#define RSC_MODE_LI (0x2)
-//
-// Eager
-//
-#define RSC_MODE_EA (0x3)
-
-//
-// RSC Endian bit values
-//
-#define RSC_BE_LITTLE 0
-#define RSC_BE_BIG    1
-
-//
-// RSC while in kernel: enabled, little endian, pl = 0, eager mode
-//
-#define RSC_KERNEL ((RSC_MODE_EA<<RSC_MODE) | (RSC_BE_LITTLE<<RSC_BE))
-//
-// Lazy RSC in kernel: enabled, little endian, pl = 0, lazy mode
-//
-#define RSC_KERNEL_LAZ ((RSC_MODE_LY<<RSC_MODE) | (RSC_BE_LITTLE<<RSC_BE))
-//
-// RSE disabled: disabled, pl = 0, little endian, eager mode
-//
-#define RSC_KERNEL_DISABLED ((RSC_MODE_LY<<RSC_MODE) | (RSC_BE_LITTLE<<RSC_BE))
-
-#endif
diff --git a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s b/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s
index dfb93821a5..ede5a61eed 100644
--- a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s
+++ b/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s
@@ -22,145 +22,6 @@
 #include  "IpfMacro.i"
 #include  "Ipf/IpfCpuCore.i"
 
-//----------------------------------------------------------------------------------
-// This module supports terminating CAR (Cache As RAM) stage. It copies all the
-// CAR data into real RAM and then makes a stack switch.
-
-// EFI_STATUS
-// SwitchCoreStacks (
-//   IN VOID  *EntryPoint,
-//   IN UINTN CopySize,
-//   IN VOID  *OldBase,
-//   IN VOID  *NewBase
-//   IN UINTN NewSP, OPTIONAL
-//   IN UINTN NewBSP OPTIONAL
-//   )
-// EFI_STATUS
-// SwitchCoreStacks (
-//   IN VOID  *EntryPointForContinuationFunction,
-//   IN UINTN StartupDescriptor,
-//   IN VOID  PEICorePointer,
-//   IN UINTN NewSP
-//   )
-//----------------------------------------------------------------------------------
-PROCEDURE_ENTRY (SwitchCoreStacks)
-
-        NESTED_SETUP (4,2,0,0)
-
-        // first save all stack registers in GPRs.
-        mov     r13 = in0;;             // this is a pointer to the PLABEL of the continuation function.
-        ld8     r16 = [r13],8;;         // r16 = address of continuation function from the PLABEL
-        ld8     gp = [r13];;            // gp  = gp of continuation function from the PLABEL
-        mov     b1 = r16;;
-
-        // save the parameters in r5, r6. these 2 seemed to be preserved across PAL calls
-        mov     r5 = in1;;              // this is the parameter1 to pass to the continuation function
-        mov     r6 = in2;;              // this is the parameter2 to pass to the continuation function
-        dep     r6=0,r6,63,1;;          // zero the bit 63.
-
-        mov     r8 = in3;;              // new stack pointer.
-
-        // r8 has the sp, this is 128K stack size, from this we will reserve 16K for the bspstore
-        movl    r15 = PEI_BSP_STORE_SIZE;;
-        sub     r8 = r8, r15;;
-        add     r15 = (GuardBand),r8;;  // some little buffer, now r15 will be our bspstore
-
-        // save the bspstore value to r4, save sp value to r7
-        mov     r4  = r15
-        mov     r7  = r8
-        mov     r16 = r8;;              // will be the new sp in uncache mode
-
-
-        alloc   r11=0,0,0,0;;           // Set 0-size frame
-        flushrs;;
-
-        mov     r21 = RSC_KERNEL_DISABLED;; // for rse disable
-        mov     ar.rsc = r21;;          // turn off RSE
-
-        add     sp = r0, r16            // transfer to the EFI stack
-        mov     ar.bspstore = r15       // switch to EFI BSP
-        invala                          // change of ar.bspstore needs invala.
-
-        mov     r19 = RSC_KERNEL_LAZ;;  // RSC enabled, Lazy mode
-        mov     ar.rsc = r19;;          // turn rse on, in kernel mode
-
-//-----------------------------------------------------------------------------------
-// Save here the meaningful stuff for next few lines and then make the PAL call.
-// Make PAL call to terminate the CAR status.
-        // AVL: do this only for recovery check call...
-
-        mov     r28=ar.k3;;
-        dep     r2 = r28,r0,0,8;;       // Extract Function bits from GR20.
-        cmp.eq  p6,p7 = RecoveryFn,r2;; // Is it Recovery check
-        (p7)  br.sptk.few DoneCARTermination; // if not, don't terminate car..
-
-TerminateCAR::
-
-        mov     r28 = ip;;
-        add     r28 = (DoneCARTerminationPALCall - TerminateCAR),r28;;
-        mov     b0 = r28
-
-        mov     r8 = ar.k5;;
-        mov     b6 = r8
-        mov     r28 = 0x208
-
-        mov     r29 = r0
-        mov     r30 = r0
-        mov     r31 = r0
-        mov     r8 = r0;;
-        br.sptk.few b6;;                // Call PAL-A call.
-
-DoneCARTerminationPALCall::
-
-// don't check error in soft sdv, it is always returning -1 for this call for some reason
-#if SOFT_SDV
-#else
-ReturnToPEIMain::
-        cmp.eq  p6,p7 = r8,r0;;
-        //
-        // dead loop if the PAL call failed, we have the CAR on but the stack is now pointing to memory
-        //
-        (p7) br.sptk.few ReturnToPEIMain;;
-        //
-        // PAL call successed,now the stack are in memory so come into cache mode
-        // instead of uncache mode
-        //
-
-        alloc   r11=0,0,0,0;;           // Set 0-size frame
-        flushrs;;
-
-        mov     r21 = RSC_KERNEL_DISABLED;; // for rse disable
-        mov     ar.rsc = r21;;          // turn off RSE
-
-        dep     r6 = 0,r6,63,1          // zero the bit 63
-        dep     r7 = 0,r7,63,1          // zero the bit 63
-        dep     r4 = 0,r4,63,1;;        // zero the bit 63
-        add     sp = r0, r7             // transfer to the EFI stack in cache mode
-        mov     ar.bspstore = r4        // switch to EFI BSP
-        invala                          // change of ar.bspstore needs invala.
-
-        mov     r19 = RSC_KERNEL_LAZ;;  // RSC enabled, Lazy mode
-        mov     ar.rsc = r19;;          // turn rse on, in kernel mode
-
-#endif
-
-DoneCARTermination::
-
-        // allocate a stack frame:
-        alloc   r11=0,2,2,0 ;;          // alloc  outs going to ensuing DXE IPL service
-                                                                                                // on the new stack
-        mov     out0 = r5;;
-        mov     out1 = r6;;
-
-        mov     r16 = b1;;
-        mov     b6 = r16;;
-        br.call.sptk.few b0=b6;;        // Call the continuation function
-
-        NESTED_RETURN
-
-PROCEDURE_EXIT(SwitchCoreStacks)
-//-----------------------------------------------------------------------------------
-
 //---------------------------------------------------------------------------------
 //++
 // GetHandOffStatus
diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 1760081cd3..647e709417 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -57,9 +57,7 @@
   Ipf/Stack.c
   Ipf/IpfPeiMain.h
   Ipf/IpfCpuCore.s
-  Ipf/IpfCpuCore.i
   Ipf/SwitchToCacheMode.c
-  Ipf/InternalSwitchStack.c
 
 [Sources.EBC]
   Dispatcher/Stack.c