diff --git a/MdePkg/Include/Library/CustomDecompressLib.h b/MdePkg/Include/Library/CustomDecompressLib.h
deleted file mode 100644
index 36e8c027cc..0000000000
--- a/MdePkg/Include/Library/CustomDecompressLib.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/** @file
- Custom Decompress Functions
-
- 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.
-
-**/
-
-
-#ifndef __CUSTOM_DECPOMPRESS_LIB_H__
-#define __CUSTOM_DECPOMPRESS_LIB_H__
-
-/**
- Decompress GetInfo fucntion.
- @param[in] DecompressGuid The guid matches this decompress method.
- @param[in] Source The source buffer containing the compressed data.
- @param[in] SourceSize The size of source buffer
- @param[out] DestinationSize The size of destination buffer.
- @param[out] ScratchSize The size of scratch buffer.
-
- @retval RETURN_SUCCESS The size of destination buffer and the size of scratch buffer are successull retrieved.
- @retval RETURN_INVALID_PARAMETER The source data is corrupted
-
-**/
-RETURN_STATUS
-EFIAPI
-CustomDecompressGetInfo (
- IN CONST GUID *DecompressGuid,
- IN CONST VOID *Source,
- IN UINT32 SourceSize,
- OUT UINT32 *DestinationSize,
- OUT UINT32 *ScratchSize
- );
-
-/**
- Decompress fucntion.
-
- @param[in] DecompressGuid The guid matches this decompress method.
- @param[in] Source The source buffer containing the compressed data.
- @param[in] Destination The destination buffer to store the decompressed data
- @param[out] Scratch The buffer used internally by the decompress routine. This buffer is needed to store intermediate data.
-
- @retval RETURN_SUCCESS Decompression is successfull
- @retval RETURN_INVALID_PARAMETER The source data is corrupted
-
-**/
-RETURN_STATUS
-EFIAPI
-CustomDecompress (
- IN CONST GUID *DecompressGuid,
- IN CONST VOID *Source,
- IN OUT VOID *Destination,
- IN OUT VOID *Scratch
- );
-
-/**
- Get decompress method guid list.
-
- @param[in, out] AlgorithmGuidTable The decompress method guid list.
- @param[in, out] NumberOfAlgorithms The number of decompress methods.
-
- @retval RETURN_SUCCESS Get all algorithmes list successfully..
-**/
-RETURN_STATUS
-EFIAPI
-CustomDecompressGetAlgorithms (
- IN OUT GUID **AlgorithmGuidTable,
- IN OUT UINT32 *NumberOfAlgorithms
- );
-
-#endif
diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
deleted file mode 100644
index f73ec6f716..0000000000
--- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/** @file
- Null implementation of the custom decompress library
-
- 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
-#include
-#include
-
-
-/**
- The internal implementation of *_DECOMPRESS_PROTOCOL.GetInfo().
-
- @param[in] Source The source buffer containing the compressed data.
- @param[in] SourceSize The size of source buffer
- @param[out] DestinationSize The size of destination buffer.
- @param[out] ScratchSize The size of scratch buffer.
-
- @retval RETURN_SUCCESS The size of destination buffer and the size of scratch buffer are successull retrieved.
- @retval RETURN_INVALID_PARAMETER The source data is corrupted
-
-**/
-RETURN_STATUS
-EFIAPI
-CustomDecompressGetInfo (
- IN CONST GUID *DecompressGuid,
- IN CONST VOID *Source,
- IN UINT32 SourceSize,
- OUT UINT32 *DestinationSize,
- OUT UINT32 *ScratchSize
- )
-{
- return RETURN_UNSUPPORTED;
-}
-
-
-/**
- The internal implementation of *_DECOMPRESS_PROTOCOL.Decompress().
-
- @param[in] Source The source buffer containing the compressed data.
- @param[in] Destination The destination buffer to store the decompressed data
- @param[out] Scratch The buffer used internally by the decompress routine. This buffer is needed to store intermediate data.
-
-
- @retval RETURN_SUCCESS Decompression is successfull
- @retval RETURN_INVALID_PARAMETER The source data is corrupted
-
-**/
-RETURN_STATUS
-EFIAPI
-CustomDecompress (
- IN CONST GUID *DecompressGuid,
- IN CONST VOID *Source,
- IN OUT VOID *Destination,
- IN OUT VOID *Scratch
- )
-{
- return RETURN_UNSUPPORTED;
-}
-
-/**
- Get decompress method guid list.
-
- @param[in, out] AlgorithmGuidTable The decompress method guid list.
- @param[in, out] NumberOfAlgorithms The number of decompress methods.
-
- @retval RETURN_SUCCESS Get all algorithmes list successfully..
-**/
-RETURN_STATUS
-EFIAPI
-CustomDecompressGetAlgorithms (
- IN OUT GUID **AlgorithmGuidTable,
- IN OUT UINT32 *NumberOfAlgorithms
- )
-{
- ASSERT (NumberOfAlgorithms != NULL);
-
- *NumberOfAlgorithms = 0;
- return RETURN_SUCCESS;
-}
diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf
deleted file mode 100644
index 6da9696e1c..0000000000
--- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-#/** @file
-# Base Custom Decompression Library
-#
-# Customer Decompress Library with NULL implementation.
-# 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.
-#
-#
-#**/
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = BaseCustomDecompressLibNull
- FILE_GUID = e5566134-c75e-4ace-bad1-e23a3b335e30
- MODULE_TYPE = BASE
- VERSION_STRING = 1.0
- LIBRARY_CLASS = CustomDecompressLib
- EDK_RELEASE_VERSION = 0x00020000
- EFI_SPECIFICATION_VERSION = 0x00020000
-
-
-#
-# VALID_ARCHITECTURES = IA32 X64 IPF EBC
-#
-
-[Sources.common]
- BaseCustomDecompressLibNull.c
-
-[Packages]
- MdePkg/MdePkg.dec
-
-[LibraryClasses]
- DebugLib
\ No newline at end of file
diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa
deleted file mode 100644
index f224cab515..0000000000
--- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- BaseCustomDecompressLibNull
- BASE
- e5566134-c75e-4ace-bad1-e23a3b335e30
- 1.0
- Base Custom Decompression Library
- Customer Decompress Library with NULL implementation.
- 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
- BaseCustomDecompressLibNull
-
-
-
- CustomDecompressLib
-
-
-
- BaseCustomDecompressLibNull.c
-
-
-
-
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
-
\ No newline at end of file