diff --git a/Model_Library b/Model_Library
index c9a8706272165916d927210c8f58d9e282388fc2..c02cc107f706aeda8c1ce9a195d40d94c1cd50d5 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit c9a8706272165916d927210c8f58d9e282388fc2
+Subproject commit c02cc107f706aeda8c1ce9a195d40d94c1cd50d5
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/components.csv
index ed4b30f81c033f1dd30cc466288a3dfbadceb26b..9832587e6368a0378a63b2ef1f7db3899d7559ad 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,177.7716667,177.7716667,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,177.7716667,177.7716667,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV178.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/components.csv
index c17f506465bafc7046bcd1ebdf3b8560547e2cb1..9c7cfc4441885b6b4b93f5f620fe13af14818fa7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,25.3412,25.3412,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,25.3412,25.3412,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV25.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/components.csv
index 82b4814e541e5492aad13e3b381755d01f64971a..8085dde2e541ced0b1c544b0ef473912fc8a9959 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/components.csv
index b098ba5d485eef8b3c715022f7c629cbd9530e0b..026ac2c10acefe8fa4e20e397b231af7fbb9718a 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV30.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/components.csv
index e779831a8987295a1f944e66e5d395d952b96507..467f776fdf50f84d54a78efac5cae4aaef752a91 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV7.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/components.csv
index e05c11311793bb17c6828e42d652169b80d1ad26..75f5c26e8930fd6757e384a5adcb28b20e4ca8a5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,72.65617391,72.65617391,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,72.65617391,72.65617391,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV73.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/components.csv
index f2a82cb55c23b1e549f222b14eb64698b63f7b6a..5c801d39c6ed08d9c76151e6b43dc78a4c269e4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,79.01571429,79.01571429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,79.01571429,79.01571429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV79.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/components.csv
index a9a7f77afe38e24ae0c41e561d994bbbb0add6ec..441c15f6154a09d208e3c041b04a1fafa0a03db7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/components.csv
index f3378ee0ad48146054d40ab1f04514cbc8a9e1f0..955e9b0f3472e41f903ef2c945f1c54936df7daa 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_PV8.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_0_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/components.csv
index 6e0b364f587e7a48b6210339ef1769b2039ccacb..57eb1cba187fa1e4456b2a5207784e18b0b1a528 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,112.43333329999999,112.43333329999999,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,112.43333329999999,112.43333329999999,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_PV112.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AC_1_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AD_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AD_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AD_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_3/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AE_4/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/AL_3_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/components.csv
index ac688ea7d9d109771f8b9d5fdcb8bbdb57f25034..a9d0508c3676ef7b6aa7de32622fdb46a252d9d1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,0.576626506,0.576626506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,0.576626506,0.576626506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV1.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/components.csv
index 6efd0adb2e1cfeca6954d3e628aecf3a6f3e43de..08fa48fe987f53303e10fcc1ceb9a9b227aa322c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/components.csv
index 52b4aef8c14b971a7b5c0c86cc2a02b448e7802f..690316ebd1e84cf9b8e2d664860be4630641cf5c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/components.csv
index 4bde9ff7a0664b66538ccb85d704b0ae7112386e..0c34b3a7b79e4a65cd951bffd223c9faa3f59a57 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/components.csv
index bf4abf603f9fa9eeea627a63033ad3a1c6856070..ec139429d5289056a31a006d5c08ddfd9eb8c64d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV5.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/components.csv
index d1c7d27713e7ad95beef413258ab6bde3d7897af..4281771fb81437dcc86781974006ccfe74fcef87 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/components.csv
index a22d694377a710c71ab4271eecbea2e8040b4d72..051463bc106898260fd09d5a911a60e7e9e28dfb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/components.csv
index 896a63d59b6a0eec27dca63efbc9a58514a2522b..e5c61c71aaf999451d51d8124afdda62afa1d587 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/components.csv
index 07bd340eb0b11701d47c3ef8e3aec80424579a9c..6bd7328cc1ca5631f32a4dd139e3f14acb1e2f79 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_0_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_10/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_10/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_10/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_10/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_10/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_10/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_10/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_10/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/components.csv
index 2472e8a4e0f769ecf47bc6ffa610f0d065478eb7..d9cde35f916db5aeeb5f1a99fd10b855b5628207 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,152.0133333,152.0133333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,152.0133333,152.0133333,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_PV152.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_10_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/components.csv
index 2472e8a4e0f769ecf47bc6ffa610f0d065478eb7..d9cde35f916db5aeeb5f1a99fd10b855b5628207 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,152.0133333,152.0133333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,152.0133333,152.0133333,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/components.csv
index e89bd28a6ae65d294876a5dbccd320dea2155157..a47e197a17f04b843de42bbaa9288f667aff64ba 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/components.csv
index 2472e8a4e0f769ecf47bc6ffa610f0d065478eb7..d9cde35f916db5aeeb5f1a99fd10b855b5628207 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,152.0133333,152.0133333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,152.0133333,152.0133333,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV152.0_STR_HP/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/components.csv
index 37a3bfa7b63e02b47fdeabd539629b03c4624d62..a62c5880af6a9cfb9d54e73b0e83dc9c1e172c97 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,26.666875,26.666875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,26.666875,26.666875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/components.csv
index bd2d0e229b4ea53a11f8f1d17d6d5a9dbff36964..2536a9d120641ea3b8ef08b6bb7c835a44f1663c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV50.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/components.csv
index b75fa935106d1d54b790a136251934564ffa8217..40ab2e0d149b2a234d5f8ad564bc284cd0e0656b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,80.0,80.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,80.0,80.0,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/components.csv
index 6fa97b7d5f55261d2cfbd7e06180e4a612c7fe41..319bd241531e282320e9ce4315d10da5e1cce23b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV80.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_11_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/components.csv
index 52b4aef8c14b971a7b5c0c86cc2a02b448e7802f..690316ebd1e84cf9b8e2d664860be4630641cf5c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV28.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/components.csv
index 6fa97b7d5f55261d2cfbd7e06180e4a612c7fe41..319bd241531e282320e9ce4315d10da5e1cce23b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_PV80.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_12_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/components.csv
index 95b72804f3504f394e8c034d2e8826bfb417faf3..2e4ad31723e735ba8cdcdc2f5b228eb230962a58 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/components.csv
index 6efd0adb2e1cfeca6954d3e628aecf3a6f3e43de..08fa48fe987f53303e10fcc1ceb9a9b227aa322c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/components.csv
index 52b4aef8c14b971a7b5c0c86cc2a02b448e7802f..690316ebd1e84cf9b8e2d664860be4630641cf5c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/components.csv
index 804782a6e0f2bbe20b3d8169f9dc56cb29d4dc26..c01be76838e49715615e054558dbf113f65830f8 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.5259490739999997,3.5259490739999997,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.5259490739999997,3.5259490739999997,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/components.csv
index 54387d17daf40ea6de527362bde2ea3d9062a519..18ed7bd5424de9e46eba09a3b36b0d14042a14a4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/components.csv
index 4bde9ff7a0664b66538ccb85d704b0ae7112386e..0c34b3a7b79e4a65cd951bffd223c9faa3f59a57 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/components.csv
index bf4abf603f9fa9eeea627a63033ad3a1c6856070..ec139429d5289056a31a006d5c08ddfd9eb8c64d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV5.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/components.csv
index a22d694377a710c71ab4271eecbea2e8040b4d72..051463bc106898260fd09d5a911a60e7e9e28dfb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_13_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/components.csv
index 37a3bfa7b63e02b47fdeabd539629b03c4624d62..a62c5880af6a9cfb9d54e73b0e83dc9c1e172c97 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,26.666875,26.666875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,26.666875,26.666875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/components.csv
index f54535bd776cf12e9037302b09aed80e056fb4f0..b1949b8150ff892e1c035b27a7a2fcca7a4ec946 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/components.csv
index bf4abf603f9fa9eeea627a63033ad3a1c6856070..ec139429d5289056a31a006d5c08ddfd9eb8c64d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV5.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/components.csv
index a22d694377a710c71ab4271eecbea2e8040b4d72..051463bc106898260fd09d5a911a60e7e9e28dfb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/components.csv
index bed079485885fb96368e3bb0d743182a09a51207..d6e5ccbc4ec7a1e13a0e7e599a5d0ef348f52ceb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,84.31875,84.31875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,84.31875,84.31875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/components.csv
index e3d4f7e87e7450c0e1723045f4a0e6e752703409..e249bf6874f0c36c6bd5fc07f28f950a1da8808c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,84.31875,84.31875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,84.31875,84.31875,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/components.csv
index 0e8a195cc09e4408955eb8dfe4daa4931a954c4d..7514e8cab3252b99cb8e71273e0904ed961c72bd 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV84.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/components.csv
index 896a63d59b6a0eec27dca63efbc9a58514a2522b..e5c61c71aaf999451d51d8124afdda62afa1d587 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_14_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/components.csv
index ac688ea7d9d109771f8b9d5fdcb8bbdb57f25034..a9d0508c3676ef7b6aa7de32622fdb46a252d9d1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,0.576626506,0.576626506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,0.576626506,0.576626506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/components.csv
index 944b35bdadd4b2f64a44d3d362f48392e9e11cea..ee23fa29fe2d984734dde895b8253292b2ab24f0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV1.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/components.csv
index 54387d17daf40ea6de527362bde2ea3d9062a519..18ed7bd5424de9e46eba09a3b36b0d14042a14a4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/components.csv
index f54535bd776cf12e9037302b09aed80e056fb4f0..b1949b8150ff892e1c035b27a7a2fcca7a4ec946 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/components.csv
index 896a63d59b6a0eec27dca63efbc9a58514a2522b..e5c61c71aaf999451d51d8124afdda62afa1d587 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_15_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/components.csv
index 37a3bfa7b63e02b47fdeabd539629b03c4624d62..a62c5880af6a9cfb9d54e73b0e83dc9c1e172c97 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,26.666875,26.666875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,26.666875,26.666875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV27.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/components.csv
index 52b4aef8c14b971a7b5c0c86cc2a02b448e7802f..690316ebd1e84cf9b8e2d664860be4630641cf5c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/components.csv
index d7385ffa26fe2eeeb57bde9e6966acf2510a3fdd..c1b29079a0f7c675c05a79bbf46f7a387865b878 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV390.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/components.csv
index bd2d0e229b4ea53a11f8f1d17d6d5a9dbff36964..2536a9d120641ea3b8ef08b6bb7c835a44f1663c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV50.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/components.csv
index b75fa935106d1d54b790a136251934564ffa8217..40ab2e0d149b2a234d5f8ad564bc284cd0e0656b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,80.0,80.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,80.0,80.0,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV80.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/components.csv
index 0e8a195cc09e4408955eb8dfe4daa4931a954c4d..7514e8cab3252b99cb8e71273e0904ed961c72bd 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV84.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_16_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_17/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_17/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_17/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_17/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_17/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_17/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_17/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_17/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_17_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/components.csv
index d6ed42866d7513371f57ba624564b7b5c4bc5176..0be1ee3a97ff575e02ec22a7df812a2c8c2ff199 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,390.0,390.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,390.0,390.0,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV390.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_18_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/components.csv
index 95b72804f3504f394e8c034d2e8826bfb417faf3..2e4ad31723e735ba8cdcdc2f5b228eb230962a58 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/components.csv
index 52b4aef8c14b971a7b5c0c86cc2a02b448e7802f..690316ebd1e84cf9b8e2d664860be4630641cf5c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/components.csv
index f54535bd776cf12e9037302b09aed80e056fb4f0..b1949b8150ff892e1c035b27a7a2fcca7a4ec946 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/components.csv
index bf4abf603f9fa9eeea627a63033ad3a1c6856070..ec139429d5289056a31a006d5c08ddfd9eb8c64d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV5.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/components.csv
index d1c7d27713e7ad95beef413258ab6bde3d7897af..4281771fb81437dcc86781974006ccfe74fcef87 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/components.csv
index a22d694377a710c71ab4271eecbea2e8040b4d72..051463bc106898260fd09d5a911a60e7e9e28dfb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_19_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/components.csv
index 6fa97b7d5f55261d2cfbd7e06180e4a612c7fe41..319bd241531e282320e9ce4315d10da5e1cce23b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV80.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/components.csv
index e3d4f7e87e7450c0e1723045f4a0e6e752703409..e249bf6874f0c36c6bd5fc07f28f950a1da8808c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,84.31875,84.31875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,84.31875,84.31875,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/components.csv
index 0e8a195cc09e4408955eb8dfe4daa4931a954c4d..7514e8cab3252b99cb8e71273e0904ed961c72bd 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_PV84.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_1_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_20/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_20/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_20/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_20/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_20/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_20/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_20/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_20/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_20_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/components.csv
index ac688ea7d9d109771f8b9d5fdcb8bbdb57f25034..a9d0508c3676ef7b6aa7de32622fdb46a252d9d1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,0.576626506,0.576626506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,0.576626506,0.576626506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV1.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/components.csv
index 6efd0adb2e1cfeca6954d3e628aecf3a6f3e43de..08fa48fe987f53303e10fcc1ceb9a9b227aa322c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/components.csv
index 52b4aef8c14b971a7b5c0c86cc2a02b448e7802f..690316ebd1e84cf9b8e2d664860be4630641cf5c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/components.csv
index 804782a6e0f2bbe20b3d8169f9dc56cb29d4dc26..c01be76838e49715615e054558dbf113f65830f8 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.5259490739999997,3.5259490739999997,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.5259490739999997,3.5259490739999997,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/components.csv
index 4bde9ff7a0664b66538ccb85d704b0ae7112386e..0c34b3a7b79e4a65cd951bffd223c9faa3f59a57 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/components.csv
index bf4abf603f9fa9eeea627a63033ad3a1c6856070..ec139429d5289056a31a006d5c08ddfd9eb8c64d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV5.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_21_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/components.csv
index 37a3bfa7b63e02b47fdeabd539629b03c4624d62..a62c5880af6a9cfb9d54e73b0e83dc9c1e172c97 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,26.666875,26.666875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,26.666875,26.666875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/components.csv
index a22d694377a710c71ab4271eecbea2e8040b4d72..051463bc106898260fd09d5a911a60e7e9e28dfb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/components.csv
index bed079485885fb96368e3bb0d743182a09a51207..d6e5ccbc4ec7a1e13a0e7e599a5d0ef348f52ceb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,84.31875,84.31875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,84.31875,84.31875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/components.csv
index e3d4f7e87e7450c0e1723045f4a0e6e752703409..e249bf6874f0c36c6bd5fc07f28f950a1da8808c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,84.31875,84.31875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,84.31875,84.31875,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/components.csv
index 0e8a195cc09e4408955eb8dfe4daa4931a954c4d..7514e8cab3252b99cb8e71273e0904ed961c72bd 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV84.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_22_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/components.csv
index e89bd28a6ae65d294876a5dbccd320dea2155157..a47e197a17f04b843de42bbaa9288f667aff64ba 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV152.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/components.csv
index 6fa97b7d5f55261d2cfbd7e06180e4a612c7fe41..319bd241531e282320e9ce4315d10da5e1cce23b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_PV80.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_23_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/components.csv
index f54535bd776cf12e9037302b09aed80e056fb4f0..b1949b8150ff892e1c035b27a7a2fcca7a4ec946 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_24_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_25/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_25/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_25/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_25/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_25/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_25/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_25/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_25/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_25_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/components.csv
index 2472e8a4e0f769ecf47bc6ffa610f0d065478eb7..d9cde35f916db5aeeb5f1a99fd10b855b5628207 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,152.0133333,152.0133333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,152.0133333,152.0133333,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/components.csv
index e89bd28a6ae65d294876a5dbccd320dea2155157..a47e197a17f04b843de42bbaa9288f667aff64ba 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV152.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/components.csv
index 63b44bd0abb54ec7309e17d068e75f65bcce7bc9..de3697b7b815740474e3b8257c1cc050fbdd9ee2 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/components.csv
index 37a3bfa7b63e02b47fdeabd539629b03c4624d62..a62c5880af6a9cfb9d54e73b0e83dc9c1e172c97 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,26.666875,26.666875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,26.666875,26.666875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV27.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/components.csv
index 6efd0adb2e1cfeca6954d3e628aecf3a6f3e43de..08fa48fe987f53303e10fcc1ceb9a9b227aa322c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/components.csv
index 52b4aef8c14b971a7b5c0c86cc2a02b448e7802f..690316ebd1e84cf9b8e2d664860be4630641cf5c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/components.csv
index 62eaa0801f0f8429865333bcaddfffee2ab22581..c6ceffdd44bf2f4c922973b9d7122dd07fe2a9b1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,288.0,288.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,288.0,288.0,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV288.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/components.csv
index f54535bd776cf12e9037302b09aed80e056fb4f0..b1949b8150ff892e1c035b27a7a2fcca7a4ec946 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/components.csv
index 6fa97b7d5f55261d2cfbd7e06180e4a612c7fe41..319bd241531e282320e9ce4315d10da5e1cce23b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV80.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_26_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/components.csv
index ac688ea7d9d109771f8b9d5fdcb8bbdb57f25034..a9d0508c3676ef7b6aa7de32622fdb46a252d9d1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,0.576626506,0.576626506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,0.576626506,0.576626506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV1.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/components.csv
index 804782a6e0f2bbe20b3d8169f9dc56cb29d4dc26..c01be76838e49715615e054558dbf113f65830f8 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.5259490739999997,3.5259490739999997,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.5259490739999997,3.5259490739999997,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/components.csv
index 4bde9ff7a0664b66538ccb85d704b0ae7112386e..0c34b3a7b79e4a65cd951bffd223c9faa3f59a57 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/components.csv
index bf4abf603f9fa9eeea627a63033ad3a1c6856070..ec139429d5289056a31a006d5c08ddfd9eb8c64d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV5.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/components.csv
index 896a63d59b6a0eec27dca63efbc9a58514a2522b..e5c61c71aaf999451d51d8124afdda62afa1d587 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/components.csv
index 07bd340eb0b11701d47c3ef8e3aec80424579a9c..6bd7328cc1ca5631f32a4dd139e3f14acb1e2f79 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_27_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/components.csv
index 95b72804f3504f394e8c034d2e8826bfb417faf3..2e4ad31723e735ba8cdcdc2f5b228eb230962a58 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/components.csv
index e89bd28a6ae65d294876a5dbccd320dea2155157..a47e197a17f04b843de42bbaa9288f667aff64ba 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV152.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/components.csv
index f54535bd776cf12e9037302b09aed80e056fb4f0..b1949b8150ff892e1c035b27a7a2fcca7a4ec946 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/components.csv
index 672eb8341fd995c962d8fe2dc8ce05b9823b6dc9..f1e98b5c46cd4d8085720bd32b994d122167d6da 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,50.0,50.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,50.0,50.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV50.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/components.csv
index 0e8a195cc09e4408955eb8dfe4daa4931a954c4d..7514e8cab3252b99cb8e71273e0904ed961c72bd 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV84.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_2_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/components.csv
index 6fa97b7d5f55261d2cfbd7e06180e4a612c7fe41..319bd241531e282320e9ce4315d10da5e1cce23b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_PV80.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_3_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/components.csv
index 37a3bfa7b63e02b47fdeabd539629b03c4624d62..a62c5880af6a9cfb9d54e73b0e83dc9c1e172c97 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,26.666875,26.666875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,26.666875,26.666875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/components.csv
index f5028ed1e70e2b7b1f12a237996059e12c6e93e2..7c0ea5a2e852a33c2c2f7325f88ff2e2b15b4cfa 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,80.0,80.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,80.0,80.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/components.csv
index 6fa97b7d5f55261d2cfbd7e06180e4a612c7fe41..319bd241531e282320e9ce4315d10da5e1cce23b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV80.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_4_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/components.csv
index c8a170b3ccdec95e3e8ab366180a114b9c4f16f4..962c7b6f5282b278998bc1e618995b6b17dff8be 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,27.5506,27.5506,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,27.5506,27.5506,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/components.csv
index 95de553ffe3ba9a34aae6f192a860afb274bccb6..a143669e5c9d09c45b88fa1de878af451fb77cf6 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV28.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/components.csv
index f54535bd776cf12e9037302b09aed80e056fb4f0..b1949b8150ff892e1c035b27a7a2fcca7a4ec946 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV4.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/components.csv
index 4b638d66edc7583145fd60cc116a80bbb925b8c3..6339bebd20edc06e18fe9be46962d9f2061dacc4 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,5.31753406,5.31753406,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,5.31753406,5.31753406,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/components.csv
index bf4abf603f9fa9eeea627a63033ad3a1c6856070..ec139429d5289056a31a006d5c08ddfd9eb8c64d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV5.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/components.csv
index d1c7d27713e7ad95beef413258ab6bde3d7897af..4281771fb81437dcc86781974006ccfe74fcef87 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/components.csv
index a22d694377a710c71ab4271eecbea2e8040b4d72..051463bc106898260fd09d5a911a60e7e9e28dfb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_5_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_6_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_7/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_7/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_7/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_7/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_7/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_7/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_7/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_7/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/components.csv
index 62eaa0801f0f8429865333bcaddfffee2ab22581..c6ceffdd44bf2f4c922973b9d7122dd07fe2a9b1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,288.0,288.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,288.0,288.0,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_PV288.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_7_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/components.csv
index 37a3bfa7b63e02b47fdeabd539629b03c4624d62..a62c5880af6a9cfb9d54e73b0e83dc9c1e172c97 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,26.666875,26.666875,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,26.666875,26.666875,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/components.csv
index d6ed42866d7513371f57ba624564b7b5c4bc5176..0be1ee3a97ff575e02ec22a7df812a2c8c2ff199 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,390.0,390.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,390.0,390.0,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_PV390.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_8_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/components.csv
index b8f946a4caf8f2b0bc47cdf204008ab2ace8059b..1c71d20bb526e032c8996b4f1ff2eb066f5afe06 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,10.00870879,10.00870879,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,10.00870879,10.00870879,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/components.csv
index 2a7170686a106c7c87597cef3d607019b1639ad4..c3636c99c1316acc9a820ba82969f510f6db047d 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV10.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/components.csv
index 2472e8a4e0f769ecf47bc6ffa610f0d065478eb7..d9cde35f916db5aeeb5f1a99fd10b855b5628207 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,152.0133333,152.0133333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,152.0133333,152.0133333,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/components.csv
index e89bd28a6ae65d294876a5dbccd320dea2155157..a47e197a17f04b843de42bbaa9288f667aff64ba 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV152.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/components.csv
index 1f6a51b283d71b32cbdddee8a8e57491f9361a02..8eb969e7e3946b5b7572e6f36060333d6f290bc0 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,16.21946429,16.21946429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,16.21946429,16.21946429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/components.csv
index d816cf245248a70b61e1fcabb401d420047d4b73..384206a45f76374315d3d7e72997f0b0ff3379fc 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV16.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/components.csv
index 49b6459a7815e79d94c049cc558f1bf24a1822cc..4013794050421a169fc1f945d5b0d2bd9393bc47 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV27.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/components.csv
index faa51fa8ed147e8d0521fac0c06be82de8cb6b3c..32a9457a10f39b0fa0e4c80a4e6f4d8cee412347 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,3.544799404,3.544799404,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,3.544799404,3.544799404,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV4.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/components.csv
index 672eb8341fd995c962d8fe2dc8ce05b9823b6dc9..f1e98b5c46cd4d8085720bd32b994d122167d6da 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,50.0,50.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,50.0,50.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/components.csv
index 336574395eb73ee90680907332ca79cde8c3313c..0ce3ed5defb42ce468f814cdff912604fe5080eb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,50.0,50.0,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,50.0,50.0,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV50.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/components.csv
index 6e12b992cca85fd27aa63369a0b748a642c938fe..062e4be6b5ae40f3f45459aada54d4e4a0e6b7bb 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.664447826,7.664447826,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.664447826,7.664447826,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/components.csv
index 38e3dfb3b7a6a56797eaad853e56b6b4d8cce0fb..765a12fcfc054af3ed0bf71b5a5b2ce06ad1abe7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,8.962421829,8.962421829,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,8.962421829,8.962421829,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/components.csv
index 01cb81321dc2fb003af8c7004b1c50f222439b77..c4cad03c2ed8101e62811784aeab84a2e5d5cd39 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_PV9.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/A_9_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/B_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/B_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/B_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/B_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/B_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/B_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/B_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/B_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/components.csv
index 9578e7f95e8ce77a2e4a8f1d9109447397e38c1e..d0bb9e297f1ecdb3c11a4fb2acd09294bebf5e80 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV103.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/components.csv
index 6e0b364f587e7a48b6210339ef1769b2039ccacb..57eb1cba187fa1e4456b2a5207784e18b0b1a528 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,112.43333329999999,112.43333329999999,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,112.43333329999999,112.43333329999999,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV112.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/components.csv
index c17f506465bafc7046bcd1ebdf3b8560547e2cb1..9c7cfc4441885b6b4b93f5f620fe13af14818fa7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,25.3412,25.3412,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,25.3412,25.3412,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV25.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/components.csv
index 82b4814e541e5492aad13e3b381755d01f64971a..8085dde2e541ced0b1c544b0ef473912fc8a9959 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV30.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/components.csv
index 675d678d3096b6420daee6c504e1b6340dc7482a..6fcf77bbeb61f3e480b09d267b6696328141f99c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/components.csv
@@ -2,12 +2,7 @@ name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,678.5,678.5,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,678.5,678.5,0.0
 battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/connections.csv
index bfccd7b29a64a66e7f4c0d95c822e07c061a591a..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV678.0_HP_STR/connections.csv
@@ -1,23 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-10,inv_bat,1,heat_pump,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/components.csv
index e05c11311793bb17c6828e42d652169b80d1ad26..75f5c26e8930fd6757e384a5adcb28b20e4ca8a5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,72.65617391,72.65617391,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,72.65617391,72.65617391,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV73.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/components.csv
index a9a7f77afe38e24ae0c41e561d994bbbb0add6ec..441c15f6154a09d208e3c041b04a1fafa0a03db7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_0_PV8.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/C_1_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/components.csv
index e05c11311793bb17c6828e42d652169b80d1ad26..75f5c26e8930fd6757e384a5adcb28b20e4ca8a5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,72.65617391,72.65617391,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,72.65617391,72.65617391,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV73.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/components.csv
index 4b8c4796146d4194a36121a74a8fa1e6728c2d1a..b91b8e4d10604991e57b97c27c57375281c1706b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,102.50375,102.50375,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,102.50375,102.50375,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_1_PV103.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/components.csv
index d7385ffa26fe2eeeb57bde9e6966acf2510a3fdd..c1b29079a0f7c675c05a79bbf46f7a387865b878 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV390.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/D_2_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/components.csv
index c17f506465bafc7046bcd1ebdf3b8560547e2cb1..9c7cfc4441885b6b4b93f5f620fe13af14818fa7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,25.3412,25.3412,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,25.3412,25.3412,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV25.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/components.csv
index 5ef69dea9a157a48c543267c14d87260805c5c89..adeb0dc09ecef9278d9baa227d13f27e43632e1c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,53.245,53.245,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,53.245,53.245,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV53.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/components.csv
index a135eae77afeca210f97d51eb462e968eb309d48..fa80863238b1447846bcfc54512805f0eee1e881 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_0_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/E_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/E_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/E_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/E_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/components.csv
index 4b8c4796146d4194a36121a74a8fa1e6728c2d1a..b91b8e4d10604991e57b97c27c57375281c1706b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,102.50375,102.50375,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,102.50375,102.50375,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV103.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/components.csv
index 63dd45a9324fe94d36b4904a7895b239571a113e..8d09721d3369273e1bf9f3eed6ee6b4b09584e61 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_0_PV112.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/components.csv
index 63dd45a9324fe94d36b4904a7895b239571a113e..8d09721d3369273e1bf9f3eed6ee6b4b09584e61 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV112.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/components.csv
index c17f506465bafc7046bcd1ebdf3b8560547e2cb1..9c7cfc4441885b6b4b93f5f620fe13af14818fa7 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,25.3412,25.3412,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,25.3412,25.3412,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV25.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/components.csv
index 82b4814e541e5492aad13e3b381755d01f64971a..8085dde2e541ced0b1c544b0ef473912fc8a9959 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/components.csv
index b098ba5d485eef8b3c715022f7c629cbd9530e0b..026ac2c10acefe8fa4e20e397b231af7fbb9718a 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV30.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/components.csv
index e779831a8987295a1f944e66e5d395d952b96507..467f776fdf50f84d54a78efac5cae4aaef752a91 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV7.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/G_1_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/I_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/I_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/I_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/I_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/I_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/I_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/I_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/I_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/I_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/I_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/I_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/I_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/I_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/I_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/I_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/I_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/components.csv
index b098ba5d485eef8b3c715022f7c629cbd9530e0b..026ac2c10acefe8fa4e20e397b231af7fbb9718a 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV30.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/components.csv
index e05c11311793bb17c6828e42d652169b80d1ad26..75f5c26e8930fd6757e384a5adcb28b20e4ca8a5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,72.65617391,72.65617391,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,72.65617391,72.65617391,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV73.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/components.csv
index f2a82cb55c23b1e549f222b14eb64698b63f7b6a..5c801d39c6ed08d9c76151e6b43dc78a4c269e4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,79.01571429,79.01571429,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,79.01571429,79.01571429,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV79.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_0_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/L_1_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/components.csv
index 6e0b364f587e7a48b6210339ef1769b2039ccacb..57eb1cba187fa1e4456b2a5207784e18b0b1a528 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,112.43333329999999,112.43333329999999,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,112.43333329999999,112.43333329999999,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV112.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/components.csv
index b098ba5d485eef8b3c715022f7c629cbd9530e0b..026ac2c10acefe8fa4e20e397b231af7fbb9718a 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV30.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/components.csv
index d7385ffa26fe2eeeb57bde9e6966acf2510a3fdd..c1b29079a0f7c675c05a79bbf46f7a387865b878 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV390.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/components.csv
index 68df4f960124ac6a746a386701ff50bf35423515..af5fe498460f61db596d84c3719816c05406d522 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/components.csv
@@ -1,11 +1,6 @@
 name,name,type,model,min_size,max_size,current_size
 pv_roof,pv_roof,PVGenerator,PV2,72.65617391,72.65617391,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,72.65617391,72.65617391,0.0
-heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
+heat_pump,heat_pump,HeatPump,EHP1,0.0,1000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/connections.csv
index 0e8994f1a266b9a9629d91e653883df2ca5ea0ae..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV73.0_HP/connections.csv
@@ -1,16 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-1,inv_pv,1,heat_pump,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-6,grd,1,heat_pump,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-14,heat_pump,1,water_tes,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-18,heat_pump,1,therm_cns,1
-19,heat_pump,1,dhw_dmd,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/components.csv
index a135eae77afeca210f97d51eb462e968eb309d48..fa80863238b1447846bcfc54512805f0eee1e881 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_PV8.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_0_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/N_1_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/components.csv
index e05c11311793bb17c6828e42d652169b80d1ad26..75f5c26e8930fd6757e384a5adcb28b20e4ca8a5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,72.65617391,72.65617391,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,72.65617391,72.65617391,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV73.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/components.csv
index 305fc870ab9afe4fe01a60a8579decfddf89d2fe..90690b95b50fa062bcc224ed305a4c1b2ad0cb03 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/components.csv
@@ -3,8 +3,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/connections.csv
index 13a3d01ed61ba28a45ff57ce6efc14b597339b9b..a2636dd09fbbc100a4781f49d20db5db46613c8b 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_0_STR/connections.csv
@@ -1,13 +1,7 @@
 ,from,output,to,input
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/Q_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/components.csv
index 5ef69dea9a157a48c543267c14d87260805c5c89..adeb0dc09ecef9278d9baa227d13f27e43632e1c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,53.245,53.245,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,53.245,53.245,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV53.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/R_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/R_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/R_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/R_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_3/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_3/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_3/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_3/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/S_3/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/S_3/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/S_3/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/S_3/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/components.csv
index e05c11311793bb17c6828e42d652169b80d1ad26..75f5c26e8930fd6757e384a5adcb28b20e4ca8a5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,72.65617391,72.65617391,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,72.65617391,72.65617391,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/components.csv
index fba67b8e7bec27c813d263deb2098dd9cea91213..32db0030619a4ff47be71d6868ceeb209b6a7ea8 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/components.csv
@@ -5,8 +5,3 @@ battery,battery,LiionBattery,BAT1,0.0,1000.0,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
 inv_bat,inv_bat,StaticBiInverter,INVBAT,0.0,1000.0,0.0
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/connections.csv
index 1659cfac6ac77f64a82821b3baba704cdd51aea6..20bc94fbda78a3c0da45c74f85f024f2d5c11f6c 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV73.0_STR/connections.csv
@@ -1,17 +1,11 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-4,inv_pv,1,inv_bat,2
-5,battery,1,inv_bat,2
-7,grd,1,elec_cns,1
-8,grd,1,inv_bat,1
-9,inv_bat,2,battery,1
-11,inv_bat,1,grd,1
-12,inv_bat,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+3,inv_pv,1,battery,1
+4,battery,1,inv_bat,2
+5,grd,1,elec_cns,1
+6,grd,1,inv_bat,1
+7,inv_bat,2,battery,1
+8,inv_bat,1,grd,1
+9,inv_bat,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/components.csv
index 4f68e68a8cf36d61b9f224e3e61cee3b0b374153..445dd731142d7fe76362cb87f0f91beaef11ebe5 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.5034625,7.5034625,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.5034625,7.5034625,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_0_PV8.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/U_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/U_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/U_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/U_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_0/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_0/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_0/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_0/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/components.csv
index 8f8b647a148a488cc0e34444687119c7f99142c8..4ad2650c50c71c4de870c0618506aec389dbc3e1 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,7.08358209,7.08358209,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,7.08358209,7.08358209,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_0_PV7.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_1/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_1/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_1/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_1/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_1/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_1/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_1/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_1/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_2/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_2/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_2/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_2/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_2/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_2/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_2/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_2/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/components.csv
index 21be46839594c6ab32a98d1cc54839fbcc043d63..c71b3fd25e7bdaa62e23a94f91f8c186758343ed 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/components.csv
@@ -3,8 +3,3 @@ pv_roof,pv_roof,PVGenerator,PV2,29.80673333,29.80673333,0.0
 inv_pv,inv_pv,StaticInverter,INVPV,29.80673333,29.80673333,0.0
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/connections.csv
index 179ef4303441e1dd8e5842536fbbe6b92e6294a8..1bb52ceb0081095c498e5d59fba4e02e013f709e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_2_PV30.0/connections.csv
@@ -1,11 +1,5 @@
 ,from,output,to,input
 0,pv_roof,1,inv_pv,1
-2,inv_pv,1,grd,1
-3,inv_pv,1,elec_cns,1
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+1,inv_pv,1,grd,1
+2,inv_pv,1,elec_cns,1
+5,grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_3/components.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_3/components.csv
index bc4946ab0ea4246c38281b44d5f5ea5db504de79..9688117b3ef333b5b4162c5f79d06c9818a9485f 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_3/components.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_3/components.csv
@@ -1,8 +1,3 @@
 name,name,type,model,min_size,max_size,current_size
 grd,grd,ElectricalGrid,GRD1,1000000.0,1000000.0,0.0
 elec_cns,elec_cns,ElectricalConsumption,,,,
-gas_boi,gas_boi,GasBoiler,BOI1,0.0,100000.0,0.0
-gas_grd,gas_grd,GasGrid,GAS1,1000000.0,1000000.0,0.0
-therm_cns,therm_cns,HeatConsumption,,,,
-dhw_dmd,dhw_dmd,HotWaterConsumption,,,,
-water_tes,water_tes,HotWaterStorage,TES1,0.0,1000000.0,0.0
diff --git a/input_files/models/prosumer_models/building_types_aachen_2022/V_3/connections.csv b/input_files/models/prosumer_models/building_types_aachen_2022/V_3/connections.csv
index 815996b039391b307cd8bf2c03012ec124f520ae..2c4dc31d64ef27a495a13152cd72be8da934bf4e 100644
--- a/input_files/models/prosumer_models/building_types_aachen_2022/V_3/connections.csv
+++ b/input_files/models/prosumer_models/building_types_aachen_2022/V_3/connections.csv
@@ -1,8 +1,2 @@
 ,from,output,to,input
-7,grd,1,elec_cns,1
-13,gas_grd,1,gas_boi,1
-15,water_tes,1,therm_cns,1
-16,water_tes,1,dhw_dmd,1
-17,gas_boi,1,water_tes,1
-20,gas_boi,1,therm_cns,1
-21,gas_boi,1,dhw_dmd,1
+5,grd,1,elec_cns,1
diff --git a/runme.py b/runme.py
index 883e4a87c9d44f4e9bcc0880a3eedf8d4a13af2d..18a464ddc6c52d8ec082fe26ac2a631f7e704ad2 100644
--- a/runme.py
+++ b/runme.py
@@ -16,7 +16,7 @@ class SimulationScope(Enum):
 
 simulation_scope = SimulationScope.DISTRICT
 t_start = pd.Timestamp("2019-01-01 00:00:00") # start time of simulation
-t_horizon = 100 # number of time steps to be simulated
+t_horizon = 8760 # number of time steps to be simulated
 t_step = 1 # length of a time step in hours
 
 inputpath_dataframe = 'input_files/models/prosumer_models/building_types_aachen_2022/running_77_2022.csv'
@@ -102,7 +102,7 @@ print('Number of PV: ' + str(count_pv))
 print('Number of AC: ' + str(count_ac))
 
 consumer_count = 0
-for i in building_types.index[53:56]:
+for i in building_types.index[54:56]:
 
     if 'A_' in building_types.iloc[i]['ID_Building']:
         # get the index of the reference profile for this building type
@@ -135,15 +135,11 @@ for i in building_types.index[53:56]:
         prosumer_dict[building_types.loc[i, 'name_building']] = {'config_path': 'input_files/models/prosumer_models/building_types_aachen_2022/'+ str(building_types.loc[i, 'ID_Building']) + '/config.csv',
                                                     'topology_path': 'input_files/models/prosumer_models/building_types_aachen_2022/'+ str(building_types.loc[i, 'ID_Building']),
                                                     'profiles': {'elec_cns': 'elec_demand_prosumer_' + str(building_types.loc[i, 'ID_Building']),
-                                                                'therm_cns': 'room_heat_demand_prosumer_' + str(building_types.loc[i,'ID_Building']),
-                                                                 'dhw_dmd': 'hot_water_demand_prosumer_' + str(building_types.loc[i, 'ID_Building']),
                                                                  'pv_roof': ['pv_factors_aachen_1']}}
     else:
         prosumer_dict[building_types.loc[i, 'name_building']] = {'config_path': 'input_files/models/prosumer_models/building_types_aachen_2022/'+ str(building_types.loc[i, 'ID_Building']) + '/config.csv',
                                                     'topology_path': 'input_files/models/prosumer_models/building_types_aachen_2022/'+ str(building_types.loc[i, 'ID_Building']),
-                                                    'profiles': {'elec_cns': 'elec_demand_prosumer_' + str(building_types.loc[i, 'ID_Building']),
-                                                                 'therm_cns': 'room_heat_demand_prosumer_' + str(building_types.loc[i,'ID_Building']),
-                                                                 'dhw_dmd': 'hot_water_demand_prosumer_' + str(building_types.loc[i, 'ID_Building'])}}
+                                                    'profiles': {'elec_cns': 'elec_demand_prosumer_' + str(building_types.loc[i, 'ID_Building'])}}