diff --git a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
index aafed23507..7bab91228a 100644
--- a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
+++ b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
@@ -68,11 +68,6 @@
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
diff --git a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
index 00e556ea21..e718ad395f 100644
--- a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
+++ b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
@@ -86,7 +86,7 @@ Returns:
     //
     Status = Fv->ReadSection (
                   Fv,
-                  &gEfiDefaultBmpLogoGuid,
+                  FileNameGuid,
                   EFI_SECTION_RAW,
                   0,
                   Image,
diff --git a/EdkModulePkg/Logo/Logo.msa b/EdkModulePkg/Logo/Logo.msa
index d64bb07d59..35923df62d 100644
--- a/EdkModulePkg/Logo/Logo.msa
+++ b/EdkModulePkg/Logo/Logo.msa
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>Logo</ModuleName>
     <ModuleType>BASE</ModuleType>
     <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for creating a Logo file.</Abstract>
-    <Description>This module provides the logo bitmap picture shown on setup screen.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>
+      This module provides the default logo bitmap picture 
+      shown on setup screen, which is correspondig to gEfiDefaultBmpLogoGuid.
+    </Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>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
@@ -24,9 +27,6 @@
   <SourceFiles>
     <Filename>Logo.bmp</Filename>
   </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
index 1d6f9139c6..89dbef0e52 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
@@ -254,7 +254,7 @@ Returns:
   // from the graphic lib
   //
   if (QuietBoot) {
-    EnableQuietBoot (&gEfiUgaSplashProtocolGuid);
+    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
     //
     // Perform system diagnostic
     //
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index d9943bb799..d1ee0ff3c2 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -136,9 +136,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUgaSplashProtocolGuid</ProtocolCName>
-    </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
@@ -227,6 +224,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
diff --git a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
index f6e29c73e7..39a24d2881 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
@@ -243,7 +243,7 @@ Returns:
   // from the graphic lib
   //
   if (QuietBoot) {
-    EnableQuietBoot (&gEfiUgaSplashProtocolGuid);
+    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
     //
     // Perform system diagnostic
     //
diff --git a/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa b/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa
index 1dec598514..989117590f 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa
@@ -98,9 +98,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUgaSplashProtocolGuid</ProtocolCName>
-    </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
@@ -195,6 +192,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
diff --git a/MdePkg/Include/IndustryStandard/SmBus.h b/MdePkg/Include/IndustryStandard/SmBus.h
index d2755dd39a..41a82246cf 100644
--- a/MdePkg/Include/IndustryStandard/SmBus.h
+++ b/MdePkg/Include/IndustryStandard/SmBus.h
@@ -45,50 +45,4 @@ typedef enum _EFI_SMBUS_OPERATION
 } EFI_SMBUS_OPERATION;
 
 #endif
-/** @file
-  This file declares the SMBus definitions defined in SmBus Specifciation
-  V2.0.
 
-  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.             
-
-  @par Revision Reference:
-  These definitions are defined in System Management Bus (SmBus) Specification V2.0.
-
-**/
-
-#ifndef _SMBUS_H_
-#define _SMBUS_H_
-
-//
-// Smbus Device Address, Smbus Device Command, Smbus Operations
-//
-typedef struct {
-  UINTN SmbusDeviceAddress : 7;
-} EFI_SMBUS_DEVICE_ADDRESS;
-
-typedef UINTN EFI_SMBUS_DEVICE_COMMAND;
-
-typedef enum _EFI_SMBUS_OPERATION
-{
-  EfiSmbusQuickRead,
-  EfiSmbusQuickWrite,
-  EfiSmbusReceiveByte,
-  EfiSmbusSendByte,
-  EfiSmbusReadByte,
-  EfiSmbusWriteByte,
-  EfiSmbusReadWord,
-  EfiSmbusWriteWord,
-  EfiSmbusReadBlock,
-  EfiSmbusWriteBlock,
-  EfiSmbusProcessCall,
-  EfiSmbusBWBRProcessCall
-} EFI_SMBUS_OPERATION;
-
-#endif