diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 2f7511fd98..952789271c 100644
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -129,7 +129,6 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy">
                    <xs:annotation>
                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 678179cf55..49d12597a0 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -231,21 +231,22 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1">
-                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>  <!-- DO NOT USE! REMOVE in FINAL -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>  <!-- DO NOT USE! REMOVE in FINAL -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations">
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
             </xs:sequence>
             <xs:attributeGroup ref="MsaAttributes"/>
         </xs:complexType>