diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index f688eb7754..ce5569186f 100644
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -15266,6 +15266,5 @@
 	    </Sections>
 	  </Ffs>
 	  
-    <Sections />
   </BuildOptions>
-</PlatformSurfaceArea>
\ No newline at end of file
+</PlatformSurfaceArea>
diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index e529128a51..9827482465 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -4288,6 +4288,5 @@
 	    </Sections>
 	  </Ffs>
 	  
-    <Sections />
   </BuildOptions>
 </PlatformSurfaceArea>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 1d5176faa1..c7b747cf1e 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -6794,11 +6794,10 @@
 	    </Sections>
 	  </Ffs>
 
-    <Sections />
 
   </BuildOptions>
   
-  <UserExtensions UserID="Fix_Me" Identifier="1">
+  <UserExtensions UserID="TianoCore" Identifier="1">
     <concat destfile="${FV_DIR}/FV_RECOVERY.fd" binary="true" >
        <fileset dir="${FV_DIR}" includes="*.fv"/>
     </concat>
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 61b18e686f..837771b196 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -2779,6 +2779,5 @@
 	    </Sections>
 	  </Ffs>
 	  
-    <Sections />
   </BuildOptions>
 </PlatformSurfaceArea>
diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 69d3c809d5..0635b3144d 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -995,6 +995,5 @@
 	    </Sections>

 	  </Ffs>

 	  

-    <Sections />

   </BuildOptions>
-</PlatformSurfaceArea>
\ No newline at end of file
+</PlatformSurfaceArea>