diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
index 3b1b390e..82927581 100644
--- a/schemas/HPXMLDataTypes.xsd
+++ b/schemas/HPXMLDataTypes.xsd
@@ -374,29 +374,6 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<xs:simpleType name="TestDate_simple">
-		<xs:restriction base="xs:dateTime"/>
-	</xs:simpleType>
-	<xs:complexType name="TestDate">
-		<xs:simpleContent>
-			<xs:extension base="TestDate_simple">
-				<xs:attribute name="dataSource" type="DataSource"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:simpleType name="TestInorOut_simple">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="test in"/>
-			<xs:enumeration value="test out"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="TestInorOut">
-		<xs:simpleContent>
-			<xs:extension base="TestInorOut_simple">
-				<xs:attribute name="dataSource" type="DataSource"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
 	<xs:simpleType name="TypeofBlowerDoorTest_simple">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="pressurization"/>
@@ -1379,19 +1356,6 @@
 	</xs:complexType>
 	<!--Lighting Below-->
 	<!--Lighting Controls Below-->
-	<xs:simpleType name="InsulationLocation_simple">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="interior"/>
-			<xs:enumeration value="exterior"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="InsulationLocation">
-		<xs:simpleContent>
-			<xs:extension base="InsulationLocation_simple">
-				<xs:attribute name="dataSource" type="DataSource"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
 	<xs:simpleType name="LightingLocation_simple">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="interior"/>
@@ -1727,7 +1691,7 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<!--Combustion Applicance Tests Below-->
+	<!--Combustion Appliance Tests Below-->
 	<xs:simpleType name="FlueCondition_simple">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="pass"/>
@@ -2382,23 +2346,6 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<!--Homeowner Questionaire Below-->
-	<xs:simpleType name="HomeownerQuestionaireScore_simple">
-		<xs:annotation>
-			<xs:documentation>1-10 score of why they chose that option</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="10"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="HomeownerQuestionaireScore">
-		<xs:simpleContent>
-			<xs:extension base="HomeownerQuestionaireScore_simple">
-				<xs:attribute name="dataSource" type="DataSource"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
 	<!--Software Information Below-->
 	<xs:simpleType name="SoftwareProgramUsed_simple">
 		<xs:restriction base="xs:string"/>
@@ -2676,16 +2623,6 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<xs:simpleType name="AuditorRelationship_simple">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<xs:complexType name="AuditorRelationship">
-		<xs:simpleContent>
-			<xs:extension base="AuditorRelationship_simple">
-				<xs:attribute name="dataSource" type="DataSource"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
 	<xs:simpleType name="HVACInstallationStandard_simple">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="ACCA 5 QI HVAC"/>
@@ -3233,16 +3170,6 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<xs:simpleType name="TotalAmount_simple">
-		<xs:restriction base="xs:decimal"/>
-	</xs:simpleType>
-	<xs:complexType name="TotalAmount">
-		<xs:simpleContent>
-			<xs:extension base="TotalAmount_simple">
-				<xs:attribute name="dataSource" type="DataSource"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
 	<xs:simpleType name="FundingSourceName_simple">
 		<xs:restriction base="xs:string"/>
 	</xs:simpleType>