diff --git a/EdkFatBinPkg/Fat.msa b/EdkFatBinPkg/Fat.msa
index 36249e52d2..44eaf3f43d 100644
--- a/EdkFatBinPkg/Fat.msa
+++ b/EdkFatBinPkg/Fat.msa
@@ -1,5 +1,5 @@
 <?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>Fat</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
@@ -8,11 +8,11 @@
     <Abstract>Make a FFS section for an FV that contains the FAT driver.*.FFS files are compressed FFS sections.</Abstract>
     <Description>This is the FAT 32 EFI/Tiano Driver</Description>
     <Copyright>Copyright 2006, 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
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <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
+      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.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -27,11 +27,8 @@
     <Filename SupArchList="X64">X64/Fat.efi</Filename>
     <Filename SupArchList="EBC">Ebc/Fat.efi</Filename>
   </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkShellBinPkg/FullShell/FullShell.msa b/EdkShellBinPkg/FullShell/FullShell.msa
index 3b019e739c..7cd4e26cd9 100644
--- a/EdkShellBinPkg/FullShell/FullShell.msa
+++ b/EdkShellBinPkg/FullShell/FullShell.msa
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>FullShell</ModuleName>
@@ -6,17 +6,15 @@
     <GuidValue>c57ad6b7-0515-40a8-9d21-551652854e37</GuidValue>
     <Version>1.1</Version>
     <Abstract>Component description file for EFI Shell module.</Abstract>
-    <Description>
-      This is a binary module containing multiple binary shell applications.
-      All .efi file tagged with "ToolCode="DUMMY"" in following file list are raw EFI application
-      file, and they are can be run in shell environment.
-    </Description>
+    <Description>This is a binary module containing multiple binary shell applications.
+      All .efi file tagged with "ToolCode="DUMMY"" in following file list are raw EFI application
+      file, and they are can be run in shell environment.</Description>
     <Copyright>Copyright (c) 2006, 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
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <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
+      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.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -30,11 +28,8 @@
     <Filename SupArchList="IPF">ipf/Shell_Full.efi</Filename>
     <Filename SupArchList="X64">x64/Shell_full.efi</Filename>
   </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkShellBinPkg/MinimumShell/MinimumShell.msa b/EdkShellBinPkg/MinimumShell/MinimumShell.msa
index 6a669f1430..f5ca33bf67 100644
--- a/EdkShellBinPkg/MinimumShell/MinimumShell.msa
+++ b/EdkShellBinPkg/MinimumShell/MinimumShell.msa
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>MinimumShell</ModuleName>
@@ -6,17 +6,15 @@
     <GuidValue>c57ad6b7-0515-40a8-9d21-551652854e37</GuidValue>
     <Version>1.2</Version>
     <Abstract>Component description file for EFI Shell module.</Abstract>
-    <Description>
-      This is a binary module containing multiple binary shell applications.
-      All .efi file tagged with "ToolCode="DUMMY"" in following file list are raw EFI application
-      file, and they are can be run in shell environment.
-    </Description>
+    <Description>This is a binary module containing multiple binary shell applications.
+      All .efi file tagged with "ToolCode="DUMMY"" in following file list are raw EFI application
+      file, and they are can be run in shell environment.</Description>
     <Copyright>Copyright (c) 2006, 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
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <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
+      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.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -172,11 +170,8 @@
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/timezone.efi</Filename>
     <Filename SupArchList="X64">x64/Shell.efi</Filename>
   </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
\ No newline at end of file