diff --git a/file_upload_schemas/measured_required.sch b/file_upload_schemas/measured_required.sch
index fe0d9f3..9268c9c 100644
--- a/file_upload_schemas/measured_required.sch
+++ b/file_upload_schemas/measured_required.sch
@@ -367,12 +367,6 @@
       <sch:assert role="ERROR" test="h:ConsumptionDetails">Expected ConsumptionDetails</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
-    <sch:title>[ConsumptionInfo]</sch:title>
-    <sch:rule context="/h:HPXML/h:Consumption/h:ConsumptionDetails/h:ConsumptionInfo">
-      <sch:assert role="ERROR" test="h:BPI2400Inputs"/>
-    </sch:rule>
-  </sch:pattern>
   <sch:pattern>
     <sch:title>[ConsumptionDetail]</sch:title>
     <sch:rule context="/h:HPXML/h:Consumption/h:ConsumptionDetails/h:ConsumptionInfo/h:ConsumptionDetail">
@@ -381,12 +375,6 @@
       <sch:assert role="ERROR" test="h:EndDateTime">Expected EndDateTime</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
-    <sch:title>[WallInsulation]</sch:title>
-    <sch:rule context="/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation">
-      <sch:assert role="ERROR" test="h:Layer">Expected Layer</sch:assert>
-    </sch:rule>
-  </sch:pattern>
   <sch:pattern>
     <sch:title>[WallInsulationLayer]</sch:title>
     <sch:rule context="/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation/h:Layer">
diff --git a/file_upload_schemas/modeled_recommended.sch b/file_upload_schemas/modeled_recommended.sch
index 8580b98..f2b2f4d 100644
--- a/file_upload_schemas/modeled_recommended.sch
+++ b/file_upload_schemas/modeled_recommended.sch
@@ -433,10 +433,10 @@
       <sch:assert role="ERROR" test="h:ConsumptionDetails">Expected ConsumptionDetails</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
+  <sch:pattern ira:remove-measured="true">
     <sch:title>[ConsumptionInfo]</sch:title>
     <sch:rule context="/h:HPXML/h:Consumption/h:ConsumptionDetails/h:ConsumptionInfo">
-      <sch:assert role="ERROR" test="h:BPI2400Inputs"/>
+      <sch:assert role="ERROR" test="h:BPI2400Inputs">Expected BPI2400Inputs</sch:assert>
     </sch:rule>
   </sch:pattern>
   <sch:pattern ira:remove-measured="true">
@@ -479,12 +479,6 @@
       <sch:assert role="ERROR" test="h:EndDateTime">Expected EndDateTime</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
-    <sch:title>[WallInsulation]</sch:title>
-    <sch:rule context="/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation">
-      <sch:assert role="ERROR" test="h:Layer">Expected Layer</sch:assert>
-    </sch:rule>
-  </sch:pattern>
   <sch:pattern>
     <sch:title>[WallInsulationLayer]</sch:title>
     <sch:rule context="/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation/h:Layer">
diff --git a/file_upload_schemas/modeled_required.sch b/file_upload_schemas/modeled_required.sch
index 8f33178..c28d3d5 100644
--- a/file_upload_schemas/modeled_required.sch
+++ b/file_upload_schemas/modeled_required.sch
@@ -377,10 +377,10 @@
       <sch:assert role="ERROR" test="h:ConsumptionDetails">Expected ConsumptionDetails</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
+  <sch:pattern ira:remove-measured="true">
     <sch:title>[ConsumptionInfo]</sch:title>
     <sch:rule context="/h:HPXML/h:Consumption/h:ConsumptionDetails/h:ConsumptionInfo">
-      <sch:assert role="ERROR" test="h:BPI2400Inputs"/>
+      <sch:assert role="ERROR" test="h:BPI2400Inputs">Expected BPI2400Inputs</sch:assert>
     </sch:rule>
   </sch:pattern>
   <sch:pattern ira:remove-measured="true">
@@ -423,12 +423,6 @@
       <sch:assert role="ERROR" test="h:EndDateTime">Expected EndDateTime</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
-    <sch:title>[WallInsulation]</sch:title>
-    <sch:rule context="/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation">
-      <sch:assert role="ERROR" test="h:Layer">Expected Layer</sch:assert>
-    </sch:rule>
-  </sch:pattern>
   <sch:pattern>
     <sch:title>[WallInsulationLayer]</sch:title>
     <sch:rule context="/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation/h:Layer">
diff --git a/file_upload_schemas/source_schematrons/modeled_recommended_extras.sch b/file_upload_schemas/source_schematrons/modeled_recommended_extras.sch
index c27747d..66f217e 100644
--- a/file_upload_schemas/source_schematrons/modeled_recommended_extras.sch
+++ b/file_upload_schemas/source_schematrons/modeled_recommended_extras.sch
@@ -49,10 +49,10 @@
     </sch:rule>
   </sch:pattern>
 
-  <sch:pattern>
+  <sch:pattern ira:remove-measured='true'>
     <sch:title>[ConsumptionInfo]</sch:title>
     <sch:rule context='/h:HPXML/h:Consumption/h:ConsumptionDetails/h:ConsumptionInfo'>
-      <sch:assert role='ERROR' test='h:BPI2400Inputs'></sch:assert>
+      <sch:assert role='ERROR' test='h:BPI2400Inputs'>Expected BPI2400Inputs</sch:assert>
     </sch:rule>
   </sch:pattern>
 
@@ -100,13 +100,6 @@
     </sch:rule>
   </sch:pattern>
 
-  <sch:pattern>
-    <sch:title>[WallInsulation]</sch:title>
-    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation'>
-      <sch:assert role='ERROR' test='h:Layer'>Expected Layer</sch:assert>
-    </sch:rule>
-  </sch:pattern>
-
   <sch:pattern>
     <sch:title>[WallInsulationLayer]</sch:title>
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:Walls/h:Wall/h:Insulation/h:Layer'>