diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/IA32/InterruptTable.S b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/IA32/InterruptTable.S
deleted file mode 100644
index a785256052..0000000000
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/IA32/InterruptTable.S
+++ /dev/null
@@ -1,67 +0,0 @@
-## @file
-# Interrupt Redirection Template
-#
-# 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.
-#
-##
-
-ASM_GLOBAL ASM_PFX(InterruptRedirectionTemplate)
-
-#----------------------------------------------------------------------------
-# Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F
-#
-# Input: None
-#
-# Output: None
-#
-# Prototype: VOID
-# InterruptRedirectionTemplate (
-# VOID
-# );
-#
-# Saves: None
-#
-# Modified: None
-#
-# Description: Contains the code that is copied into low memory (below 640K).
-# This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.
-# This template must be copied into low memory, and the IDT entries
-# 0x68-0x6F must be point to the low memory copy of this code. Each
-# entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily
-# computed.
-#
-#----------------------------------------------------------------------------
-ASM_PFX(InterruptRedirectionTemplate):
- int $0x8
- .byte 0xcf
- nop
- int $0x9
- .byte 0xcf
- nop
- int $0xa
- .byte 0xcf
- nop
- int $0xb
- .byte 0xcf
- nop
- int $0xc
- .byte 0xcf
- nop
- int $0xd
- .byte 0xcf
- nop
- int $0xe
- .byte 0xcf
- nop
- int $0xf
- .byte 0xcf
- nop
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/IA32/InterruptTable.asm b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/IA32/InterruptTable.asm
deleted file mode 100644
index 410ce5be6e..0000000000
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/IA32/InterruptTable.asm
+++ /dev/null
@@ -1,73 +0,0 @@
-;; @file
-; Interrupt Redirection Template
-;
-; 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.
-;
-;;
-
-.686P
-.MODEL FLAT, C
-.CODE
-
-;----------------------------------------------------------------------------
-; Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F
-;
-; Input: None
-;
-; Output: None
-;
-; Prototype: VOID
-; InterruptRedirectionTemplate (
-; VOID
-; );
-;
-; Saves: None
-;
-; Modified: None
-;
-; Description: Contains the code that is copied into low memory (below 640K).
-; This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.
-; This template must be copied into low memory, and the IDT entries
-; 0x68-0x6F must be point to the low memory copy of this code. Each
-; entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily
-; computed.
-;
-;----------------------------------------------------------------------------
-
-InterruptRedirectionTemplate PROC C
- int 08h
- DB 0cfh ; IRET
- nop
- int 09h
- DB 0cfh ; IRET
- nop
- int 0ah
- DB 0cfh ; IRET
- nop
- int 0bh
- DB 0cfh ; IRET
- nop
- int 0ch
- DB 0cfh ; IRET
- nop
- int 0dh
- DB 0cfh ; IRET
- nop
- int 0eh
- DB 0cfh ; IRET
- nop
- int 0fh
- DB 0cfh ; IRET
- nop
-InterruptRedirectionTemplate ENDP
-
-END
\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
index 180c18e3fc..a1b94b4399 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
@@ -3,7 +3,7 @@
#
# This driver installs Legacy Bios Protocol to support CSM module work in EFI system.
#
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions
@@ -41,8 +41,6 @@
LegacyPci.c
[Sources.Ia32]
- IA32/InterruptTable.S
- IA32/InterruptTable.asm
IA32/InterruptTable.nasm
Thunk.c
LegacyBootSupport.c
@@ -51,8 +49,6 @@
[Sources.X64]
X64/InterruptTable.nasm
- X64/InterruptTable.asm
- X64/InterruptTable.S
Thunk.c
LegacyBootSupport.c
LegacyBbs.c
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/X64/InterruptTable.S b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/X64/InterruptTable.S
deleted file mode 100644
index 0c9ce01d5b..0000000000
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/X64/InterruptTable.S
+++ /dev/null
@@ -1,72 +0,0 @@
-## @file
-# Interrupt Redirection Template
-#
-# 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.
-#
-##
-
-#text SEGMENT
-
-
-#----------------------------------------------------------------------------
-# Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F
-#
-# Input: None
-#
-# Output: None
-#
-# Prototype: VOID
-# InterruptRedirectionTemplate (
-# VOID
-# );
-#
-# Saves: None
-#
-# Modified: None
-#
-# Description: Contains the code that is copied into low memory (below 640K).
-# This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.
-# This template must be copied into low memory, and the IDT entries
-# 0x68-0x6F must be point to the low memory copy of this code. Each
-# entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily
-# computed.
-#
-#----------------------------------------------------------------------------
-
-ASM_GLOBAL ASM_PFX(InterruptRedirectionTemplate)
-ASM_PFX(InterruptRedirectionTemplate):
- int $0x08
- .byte 0x0cf # IRET
- nop
- int $0x09
- .byte 0x0cf # IRET
- nop
- int $0x0a
- .byte 0x0cf # IRET
- nop
- int $0x0b
- .byte 0x0cf # IRET
- nop
- int $0x0c
- .byte 0x0cf # IRET
- nop
- int $0x0d
- .byte 0x0cf # IRET
- nop
- int $0x0e
- .byte 0x0cf # IRET
- nop
- int $0x0f
- .byte 0x0cf # IRET
- nop
-
-#END
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/X64/InterruptTable.asm b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/X64/InterruptTable.asm
deleted file mode 100644
index 750423e5b7..0000000000
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/X64/InterruptTable.asm
+++ /dev/null
@@ -1,71 +0,0 @@
-;; @file
-; Interrupt Redirection Template
-;
-; 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.
-;
-;;
-
-text SEGMENT
-
-;----------------------------------------------------------------------------
-; Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F
-;
-; Input: None
-;
-; Output: None
-;
-; Prototype: VOID
-; InterruptRedirectionTemplate (
-; VOID
-; );
-;
-; Saves: None
-;
-; Modified: None
-;
-; Description: Contains the code that is copied into low memory (below 640K).
-; This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.
-; This template must be copied into low memory, and the IDT entries
-; 0x68-0x6F must be point to the low memory copy of this code. Each
-; entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily
-; computed.
-;
-;----------------------------------------------------------------------------
-
-InterruptRedirectionTemplate PROC
- int 08h
- DB 0cfh ; IRET
- nop
- int 09h
- DB 0cfh ; IRET
- nop
- int 0ah
- DB 0cfh ; IRET
- nop
- int 0bh
- DB 0cfh ; IRET
- nop
- int 0ch
- DB 0cfh ; IRET
- nop
- int 0dh
- DB 0cfh ; IRET
- nop
- int 0eh
- DB 0cfh ; IRET
- nop
- int 0fh
- DB 0cfh ; IRET
- nop
-InterruptRedirectionTemplate ENDP
-
-END
\ No newline at end of file