diff --git a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
index 71d07462c2d5ef74b5081b616bae69fa16ef4696..641ba01c2875bf6c7f03e84b6fb870d39c9a3d4b 100644
--- a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
+++ b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
@@ -15,18 +15,6 @@
           <element maxOccurs="unbounded" minOccurs="0" name="surveyYearVersion" type="double"/>
           <element maxOccurs="unbounded" minOccurs="0" name="surveyDescription" type="string"/>
           <element minOccurs="0" name="population" type="integer"/>
-          <element minOccurs="0" name="waterSurveyProperty">
-            <annotation>
-              <appinfo>
-                <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
-              </appinfo>
-            </annotation>
-            <complexType>
-              <sequence>
-                <element ref="FWEB:WaterSurvey"/>
-              </sequence>
-            </complexType>
-          </element>
         </sequence>
       </extension>
     </complexContent>
@@ -37,82 +25,6 @@
     </sequence>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
   </complexType>
-  <element name="EnergySurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:EnergySurveyType"/>
-  <complexType name="EnergySurveyType">
-    <complexContent>
-      <extension base="FWEB:BuildingSurveyType">
-        <sequence>
-          <element minOccurs="0" name="spaceHeatingDemand" type="double"/>
-          <element minOccurs="0" name="spaceHeatingDemandUnit" type="string"/>
-          <element minOccurs="0" name="spaceCoolingDemand" type="double"/>
-          <element minOccurs="0" name="spaceCoolingDemandUnit" type="string"/>
-          <element minOccurs="0" name="residentialElectricityDemand" type="double"/>
-          <element minOccurs="0" name="residentialElectricityDemandUnit" type="string"/>
-          <element minOccurs="0" name="electricityPotentialFromPV" type="double"/>
-          <element minOccurs="0" name="electricityPotentialfromPVUnit" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EnergySurveyPropertyType">
-    <sequence minOccurs="0">
-      <element ref="FWEB:EnergySurvey"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="FoodSurvey" substitutionGroup="gml:_Feature" type="FWEB:FoodSurveyType"/>
-  <complexType name="FoodSurveyType">
-    <complexContent>
-      <extension base="gml:AbstractFeatureType">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="foodCategory" type="gml:CodeType"/>
-          <element minOccurs="0" name="foodDemand" type="double"/>
-          <element minOccurs="0" name="foodDemandUnit" type="string"/>
-          <element minOccurs="0" name="foodProduction" type="double"/>
-          <element minOccurs="0" name="foodProductionUnit" type="string"/>
-          <element minOccurs="0" name="foodProductionWaterDemand" type="double"/>
-          <element minOccurs="0" name="foodProductionWaterDemandUnit" type="string"/>
-          <element minOccurs="0" name="foodProductionEnergyDemand" type="double"/>
-          <element minOccurs="0" name="foodProductionEnergyDemandUnit" type="string"/>
-          <element minOccurs="0" name="foodConsumption" type="double"/>
-          <element minOccurs="0" name="foodConsumptionUnit" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="FoodSurveyPropertyType">
-    <sequence minOccurs="0">
-      <element ref="FWEB:FoodSurvey"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="WaterSurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:WaterSurveyType"/>
-  <complexType name="WaterSurveyType">
-    <complexContent>
-      <extension base="FWEB:BuildingSurveyType">
-        <sequence>
-          <element minOccurs="0" name="domesticWaterDemand" type="double"/>
-          <element minOccurs="0" name="domesticWaterDemandUnit" type="string"/>
-          <element minOccurs="0" name="domesticHotWaterDemand" type="double"/>
-          <element minOccurs="0" name="domesticHotWaterDemandUnit" type="string"/>
-          <element minOccurs="0" name="domesticHotWaterEnergyDemand" type="double"/>
-          <element minOccurs="0" name="domesticHotWaterEnergyDemandUnit" type="string"/>
-          <element minOccurs="0" name="domesticWaterWaste" type="double"/>
-          <element minOccurs="0" name="domesticWaterWasteUnit" type="string"/>
-          <element minOccurs="0" name="domesticSolidWaste" type="double"/>
-          <element minOccurs="0" name="domesticSolidWasteUnit" type="string"/>
-          <element minOccurs="0" name="totalDomesticWaste" type="double"/>
-          <element minOccurs="0" name="totalDomesticWasteUnit" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="WaterSurveyPropertyType">
-    <sequence minOccurs="0">
-      <element ref="FWEB:WaterSurvey"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
   <element name="buildingFootprintArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="gml:AreaType">
     <annotation>
       <appinfo>