From 96205c1b75eeba7786aa6d403982540e67e28e7b Mon Sep 17 00:00:00 2001
From: Jonas Paul Brucksch <jonas.brucksch@isea.rwth-aachen.de>
Date: Fri, 7 Apr 2023 10:58:13 +0200
Subject: [PATCH] no heat&hw demands bc irrelevant for flex for now

---
 Model_Library                                 |  2 +-
 .../AC_0/components.csv                       |  5 ----
 .../AC_0/connections.csv                      |  8 +----
 .../AC_0_PV178.0/components.csv               |  5 ----
 .../AC_0_PV178.0/connections.csv              | 12 ++------
 .../AC_0_PV25.0/components.csv                |  5 ----
 .../AC_0_PV25.0/connections.csv               | 12 ++------
 .../AC_0_PV30.0/components.csv                |  5 ----
 .../AC_0_PV30.0/connections.csv               | 12 ++------
 .../AC_0_PV30.0_HP/components.csv             |  7 +----
 .../AC_0_PV30.0_HP/connections.csv            | 17 ++---------
 .../AC_0_PV30.0_STR/components.csv            |  5 ----
 .../AC_0_PV30.0_STR/connections.csv           | 24 ++++++---------
 .../AC_0_PV7.0/components.csv                 |  5 ----
 .../AC_0_PV7.0/connections.csv                | 12 ++------
 .../AC_0_PV7.0_STR/components.csv             |  5 ----
 .../AC_0_PV7.0_STR/connections.csv            | 24 ++++++---------
 .../AC_0_PV73.0/components.csv                |  5 ----
 .../AC_0_PV73.0/connections.csv               | 12 ++------
 .../AC_0_PV79.0/components.csv                |  5 ----
 .../AC_0_PV79.0/connections.csv               | 12 ++------
 .../AC_0_PV8.0/components.csv                 |  5 ----
 .../AC_0_PV8.0/connections.csv                | 12 ++------
 .../AC_0_PV8.0_HP/components.csv              |  7 +----
 .../AC_0_PV8.0_HP/connections.csv             | 17 ++---------
 .../AC_0_PV8.0_HP_STR/components.csv          |  7 +----
 .../AC_0_PV8.0_HP_STR/connections.csv         | 30 ++++++-------------
 .../AC_0_STR/components.csv                   |  5 ----
 .../AC_0_STR/connections.csv                  | 18 ++++-------
 .../AC_1/components.csv                       |  5 ----
 .../AC_1/connections.csv                      |  8 +----
 .../AC_1_PV112.0/components.csv               |  5 ----
 .../AC_1_PV112.0/connections.csv              | 12 ++------
 .../AC_1_STR/components.csv                   |  5 ----
 .../AC_1_STR/connections.csv                  | 18 ++++-------
 .../AD_0/components.csv                       |  5 ----
 .../AD_0/connections.csv                      |  8 +----
 .../AD_1/components.csv                       |  5 ----
 .../AD_1/connections.csv                      |  8 +----
 .../AD_2/components.csv                       |  5 ----
 .../AD_2/connections.csv                      |  8 +----
 .../AE_0/components.csv                       |  5 ----
 .../AE_0/connections.csv                      |  8 +----
 .../AE_0_PV7.0/components.csv                 |  5 ----
 .../AE_0_PV7.0/connections.csv                | 12 ++------
 .../AE_1/components.csv                       |  5 ----
 .../AE_1/connections.csv                      |  8 +----
 .../AE_2/components.csv                       |  5 ----
 .../AE_2/connections.csv                      |  8 +----
 .../AE_3/components.csv                       |  5 ----
 .../AE_3/connections.csv                      |  8 +----
 .../AE_4/components.csv                       |  5 ----
 .../AE_4/connections.csv                      |  8 +----
 .../AL_0/components.csv                       |  5 ----
 .../AL_0/connections.csv                      |  8 +----
 .../AL_0_PV7.0/components.csv                 |  5 ----
 .../AL_0_PV7.0/connections.csv                | 12 ++------
 .../AL_0_PV8.0/components.csv                 |  5 ----
 .../AL_0_PV8.0/connections.csv                | 12 ++------
 .../AL_1/components.csv                       |  5 ----
 .../AL_1/connections.csv                      |  8 +----
 .../AL_2/components.csv                       |  5 ----
 .../AL_2/connections.csv                      |  8 +----
 .../AL_3/components.csv                       |  5 ----
 .../AL_3/connections.csv                      |  8 +----
 .../AL_3_PV8.0/components.csv                 |  5 ----
 .../AL_3_PV8.0/connections.csv                | 12 ++------
 .../A_0/components.csv                        |  5 ----
 .../A_0/connections.csv                       |  8 +----
 .../A_0_PV1.0/components.csv                  |  5 ----
 .../A_0_PV1.0/connections.csv                 | 12 ++------
 .../A_0_PV10.0/components.csv                 |  5 ----
 .../A_0_PV10.0/connections.csv                | 12 ++------
 .../A_0_PV10.0_STR/components.csv             |  5 ----
 .../A_0_PV10.0_STR/connections.csv            | 24 ++++++---------
 .../A_0_PV28.0/components.csv                 |  5 ----
 .../A_0_PV28.0/connections.csv                | 12 ++------
 .../A_0_PV28.0_HP/components.csv              |  7 +----
 .../A_0_PV28.0_HP/connections.csv             | 17 ++---------
 .../A_0_PV28.0_HP_STR/components.csv          |  7 +----
 .../A_0_PV28.0_HP_STR/connections.csv         | 30 ++++++-------------
 .../A_0_PV28.0_STR/components.csv             |  5 ----
 .../A_0_PV28.0_STR/connections.csv            | 24 ++++++---------
 .../A_0_PV4.0/components.csv                  |  5 ----
 .../A_0_PV4.0/connections.csv                 | 12 ++------
 .../A_0_PV4.0_STR/components.csv              |  5 ----
 .../A_0_PV4.0_STR/connections.csv             | 24 ++++++---------
 .../A_0_PV5.0/components.csv                  |  5 ----
 .../A_0_PV5.0/connections.csv                 | 12 ++------
 .../A_0_PV5.0_STR/components.csv              |  5 ----
 .../A_0_PV5.0_STR/connections.csv             | 24 ++++++---------
 .../A_0_PV8.0/components.csv                  |  5 ----
 .../A_0_PV8.0/connections.csv                 | 12 ++------
 .../A_0_PV8.0_HP/components.csv               |  7 +----
 .../A_0_PV8.0_HP/connections.csv              | 17 ++---------
 .../A_0_PV8.0_STR/components.csv              |  5 ----
 .../A_0_PV8.0_STR/connections.csv             | 24 ++++++---------
 .../A_0_PV9.0/components.csv                  |  5 ----
 .../A_0_PV9.0/connections.csv                 | 12 ++------
 .../A_0_PV9.0_HP/components.csv               |  7 +----
 .../A_0_PV9.0_HP/connections.csv              | 17 ++---------
 .../A_0_PV9.0_HP_STR/components.csv           |  7 +----
 .../A_0_PV9.0_HP_STR/connections.csv          | 30 ++++++-------------
 .../A_0_PV9.0_STR/components.csv              |  5 ----
 .../A_0_PV9.0_STR/connections.csv             | 24 ++++++---------
 .../A_0_STR/components.csv                    |  5 ----
 .../A_0_STR/connections.csv                   | 18 ++++-------
 .../A_1/components.csv                        |  5 ----
 .../A_1/connections.csv                       |  8 +----
 .../A_10/components.csv                       |  5 ----
 .../A_10/connections.csv                      |  8 +----
 .../A_10_PV152.0_HP_STR/components.csv        |  7 +----
 .../A_10_PV152.0_HP_STR/connections.csv       | 30 ++++++-------------
 .../A_10_STR/components.csv                   |  5 ----
 .../A_10_STR/connections.csv                  | 18 ++++-------
 .../A_11/components.csv                       |  5 ----
 .../A_11/connections.csv                      |  8 +----
 .../A_11_PV10.0/components.csv                |  5 ----
 .../A_11_PV10.0/connections.csv               | 12 ++------
 .../A_11_PV152.0_HP_STR/components.csv        |  7 +----
 .../A_11_PV152.0_HP_STR/connections.csv       | 30 ++++++-------------
 .../A_11_PV152.0_STR/components.csv           |  5 ----
 .../A_11_PV152.0_STR/connections.csv          | 24 ++++++---------
 .../A_11_PV152.0_STR_HP/components.csv        |  7 +----
 .../A_11_PV152.0_STR_HP/connections.csv       | 30 ++++++-------------
 .../A_11_PV16.0/components.csv                |  5 ----
 .../A_11_PV16.0/connections.csv               | 12 ++------
 .../A_11_PV27.0/components.csv                |  5 ----
 .../A_11_PV27.0/connections.csv               | 12 ++------
 .../A_11_PV27.0_STR/components.csv            |  5 ----
 .../A_11_PV27.0_STR/connections.csv           | 24 ++++++---------
 .../A_11_PV28.0_STR/components.csv            |  5 ----
 .../A_11_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_11_PV4.0/components.csv                 |  5 ----
 .../A_11_PV4.0/connections.csv                | 12 ++------
 .../A_11_PV50.0_STR/components.csv            |  5 ----
 .../A_11_PV50.0_STR/connections.csv           | 24 ++++++---------
 .../A_11_PV80.0_HP_STR/components.csv         |  7 +----
 .../A_11_PV80.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_11_PV80.0_STR/components.csv            |  5 ----
 .../A_11_PV80.0_STR/connections.csv           | 24 ++++++---------
 .../A_11_PV9.0/components.csv                 |  5 ----
 .../A_11_PV9.0/connections.csv                | 12 ++------
 .../A_11_PV9.0_STR/components.csv             |  5 ----
 .../A_11_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_11_STR/components.csv                   |  5 ----
 .../A_11_STR/connections.csv                  | 18 ++++-------
 .../A_12/components.csv                       |  5 ----
 .../A_12/connections.csv                      |  8 +----
 .../A_12_PV28.0_HP_STR/components.csv         |  7 +----
 .../A_12_PV28.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_12_PV80.0_STR/components.csv            |  5 ----
 .../A_12_PV80.0_STR/connections.csv           | 24 ++++++---------
 .../A_12_STR/components.csv                   |  5 ----
 .../A_12_STR/connections.csv                  | 18 ++++-------
 .../A_13/components.csv                       |  5 ----
 .../A_13/connections.csv                      |  8 +----
 .../A_13_PV10.0/components.csv                |  5 ----
 .../A_13_PV10.0/connections.csv               | 12 ++------
 .../A_13_PV10.0_HP/components.csv             |  7 +----
 .../A_13_PV10.0_HP/connections.csv            | 17 ++---------
 .../A_13_PV10.0_STR/components.csv            |  5 ----
 .../A_13_PV10.0_STR/connections.csv           | 24 ++++++---------
 .../A_13_PV16.0/components.csv                |  5 ----
 .../A_13_PV16.0/connections.csv               | 12 ++------
 .../A_13_PV16.0_STR/components.csv            |  5 ----
 .../A_13_PV16.0_STR/connections.csv           | 24 ++++++---------
 .../A_13_PV28.0/components.csv                |  5 ----
 .../A_13_PV28.0/connections.csv               | 12 ++------
 .../A_13_PV28.0_HP/components.csv             |  7 +----
 .../A_13_PV28.0_HP/connections.csv            | 17 ++---------
 .../A_13_PV28.0_HP_STR/components.csv         |  7 +----
 .../A_13_PV28.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_13_PV28.0_STR/components.csv            |  5 ----
 .../A_13_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_13_PV4.0/components.csv                 |  5 ----
 .../A_13_PV4.0/connections.csv                | 12 ++------
 .../A_13_PV4.0_HP/components.csv              |  7 +----
 .../A_13_PV4.0_HP/connections.csv             | 17 ++---------
 .../A_13_PV4.0_STR/components.csv             |  5 ----
 .../A_13_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_13_PV5.0/components.csv                 |  5 ----
 .../A_13_PV5.0/connections.csv                | 12 ++------
 .../A_13_PV5.0_STR/components.csv             |  5 ----
 .../A_13_PV5.0_STR/connections.csv            | 24 ++++++---------
 .../A_13_PV8.0/components.csv                 |  5 ----
 .../A_13_PV8.0/connections.csv                | 12 ++------
 .../A_13_PV8.0_STR/components.csv             |  5 ----
 .../A_13_PV8.0_STR/connections.csv            | 24 ++++++---------
 .../A_13_PV9.0/components.csv                 |  5 ----
 .../A_13_PV9.0/connections.csv                | 12 ++------
 .../A_13_PV9.0_STR/components.csv             |  5 ----
 .../A_13_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_13_STR/components.csv                   |  5 ----
 .../A_13_STR/connections.csv                  | 18 ++++-------
 .../A_14/components.csv                       |  5 ----
 .../A_14/connections.csv                      |  8 +----
 .../A_14_PV10.0/components.csv                |  5 ----
 .../A_14_PV10.0/connections.csv               | 12 ++------
 .../A_14_PV10.0_STR/components.csv            |  5 ----
 .../A_14_PV10.0_STR/connections.csv           | 24 ++++++---------
 .../A_14_PV16.0/components.csv                |  5 ----
 .../A_14_PV16.0/connections.csv               | 12 ++------
 .../A_14_PV16.0_STR/components.csv            |  5 ----
 .../A_14_PV16.0_STR/connections.csv           | 24 ++++++---------
 .../A_14_PV27.0/components.csv                |  5 ----
 .../A_14_PV27.0/connections.csv               | 12 ++------
 .../A_14_PV27.0_STR/components.csv            |  5 ----
 .../A_14_PV27.0_STR/connections.csv           | 24 ++++++---------
 .../A_14_PV28.0/components.csv                |  5 ----
 .../A_14_PV28.0/connections.csv               | 12 ++------
 .../A_14_PV4.0/components.csv                 |  5 ----
 .../A_14_PV4.0/connections.csv                | 12 ++------
 .../A_14_PV4.0_STR/components.csv             |  5 ----
 .../A_14_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_14_PV5.0/components.csv                 |  5 ----
 .../A_14_PV5.0/connections.csv                | 12 ++------
 .../A_14_PV5.0_STR/components.csv             |  5 ----
 .../A_14_PV5.0_STR/connections.csv            | 24 ++++++---------
 .../A_14_PV8.0/components.csv                 |  5 ----
 .../A_14_PV8.0/connections.csv                | 12 ++------
 .../A_14_PV8.0_STR/components.csv             |  5 ----
 .../A_14_PV8.0_STR/connections.csv            | 24 ++++++---------
 .../A_14_PV84.0/components.csv                |  5 ----
 .../A_14_PV84.0/connections.csv               | 12 ++------
 .../A_14_PV84.0_HP_STR/components.csv         |  7 +----
 .../A_14_PV84.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_14_PV84.0_STR/components.csv            |  5 ----
 .../A_14_PV84.0_STR/connections.csv           | 24 ++++++---------
 .../A_14_PV9.0/components.csv                 |  5 ----
 .../A_14_PV9.0/connections.csv                | 12 ++------
 .../A_14_PV9.0_HP/components.csv              |  7 +----
 .../A_14_PV9.0_HP/connections.csv             | 17 ++---------
 .../A_14_PV9.0_STR/components.csv             |  5 ----
 .../A_14_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_14_STR/components.csv                   |  5 ----
 .../A_14_STR/connections.csv                  | 18 ++++-------
 .../A_15/components.csv                       |  5 ----
 .../A_15/connections.csv                      |  8 +----
 .../A_15_PV1.0/components.csv                 |  5 ----
 .../A_15_PV1.0/connections.csv                | 12 ++------
 .../A_15_PV1.0_STR/components.csv             |  5 ----
 .../A_15_PV1.0_STR/connections.csv            | 24 ++++++---------
 .../A_15_PV4.0/components.csv                 |  5 ----
 .../A_15_PV4.0/connections.csv                | 12 ++------
 .../A_15_PV4.0_HP/components.csv              |  7 +----
 .../A_15_PV4.0_HP/connections.csv             | 17 ++---------
 .../A_15_PV4.0_STR/components.csv             |  5 ----
 .../A_15_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_15_PV9.0/components.csv                 |  5 ----
 .../A_15_PV9.0/connections.csv                | 12 ++------
 .../A_15_PV9.0_HP/components.csv              |  7 +----
 .../A_15_PV9.0_HP/connections.csv             | 17 ++---------
 .../A_15_PV9.0_STR/components.csv             |  5 ----
 .../A_15_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_15_STR/components.csv                   |  5 ----
 .../A_15_STR/connections.csv                  | 18 ++++-------
 .../A_16/components.csv                       |  5 ----
 .../A_16/connections.csv                      |  8 +----
 .../A_16_PV27.0/components.csv                |  5 ----
 .../A_16_PV27.0/connections.csv               | 12 ++------
 .../A_16_PV28.0_HP_STR/components.csv         |  7 +----
 .../A_16_PV28.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_16_PV28.0_STR/components.csv            |  5 ----
 .../A_16_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_16_PV390.0_STR/components.csv           |  5 ----
 .../A_16_PV390.0_STR/connections.csv          | 24 ++++++---------
 .../A_16_PV50.0_STR/components.csv            |  5 ----
 .../A_16_PV50.0_STR/connections.csv           | 24 ++++++---------
 .../A_16_PV80.0_HP_STR/components.csv         |  7 +----
 .../A_16_PV80.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_16_PV84.0_STR/components.csv            |  5 ----
 .../A_16_PV84.0_STR/connections.csv           | 24 ++++++---------
 .../A_16_PV9.0_STR/components.csv             |  5 ----
 .../A_16_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_16_STR/components.csv                   |  5 ----
 .../A_16_STR/connections.csv                  | 18 ++++-------
 .../A_17/components.csv                       |  5 ----
 .../A_17/connections.csv                      |  8 +----
 .../A_17_STR/components.csv                   |  5 ----
 .../A_17_STR/connections.csv                  | 18 ++++-------
 .../A_18/components.csv                       |  5 ----
 .../A_18/connections.csv                      |  8 +----
 .../A_18_PV390.0_HP_STR/components.csv        |  7 +----
 .../A_18_PV390.0_HP_STR/connections.csv       | 30 ++++++-------------
 .../A_18_PV9.0_STR/components.csv             |  5 ----
 .../A_18_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_18_STR/components.csv                   |  5 ----
 .../A_18_STR/connections.csv                  | 18 ++++-------
 .../A_19/components.csv                       |  5 ----
 .../A_19/connections.csv                      |  8 +----
 .../A_19_PV10.0/components.csv                |  5 ----
 .../A_19_PV10.0/connections.csv               | 12 ++------
 .../A_19_PV10.0_HP/components.csv             |  7 +----
 .../A_19_PV10.0_HP/connections.csv            | 17 ++---------
 .../A_19_PV10.0_STR/components.csv            |  5 ----
 .../A_19_PV10.0_STR/connections.csv           | 24 ++++++---------
 .../A_19_PV16.0/components.csv                |  5 ----
 .../A_19_PV16.0/connections.csv               | 12 ++------
 .../A_19_PV16.0_STR/components.csv            |  5 ----
 .../A_19_PV16.0_STR/connections.csv           | 24 ++++++---------
 .../A_19_PV28.0/components.csv                |  5 ----
 .../A_19_PV28.0/connections.csv               | 12 ++------
 .../A_19_PV28.0_HP_STR/components.csv         |  7 +----
 .../A_19_PV28.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_19_PV28.0_STR/components.csv            |  5 ----
 .../A_19_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_19_PV4.0/components.csv                 |  5 ----
 .../A_19_PV4.0/connections.csv                | 12 ++------
 .../A_19_PV4.0_STR/components.csv             |  5 ----
 .../A_19_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_19_PV5.0/components.csv                 |  5 ----
 .../A_19_PV5.0/connections.csv                | 12 ++------
 .../A_19_PV5.0_STR/components.csv             |  5 ----
 .../A_19_PV5.0_STR/connections.csv            | 24 ++++++---------
 .../A_19_PV8.0/components.csv                 |  5 ----
 .../A_19_PV8.0/connections.csv                | 12 ++------
 .../A_19_PV8.0_HP/components.csv              |  7 +----
 .../A_19_PV8.0_HP/connections.csv             | 17 ++---------
 .../A_19_PV8.0_STR/components.csv             |  5 ----
 .../A_19_PV8.0_STR/connections.csv            | 24 ++++++---------
 .../A_19_PV9.0/components.csv                 |  5 ----
 .../A_19_PV9.0/connections.csv                | 12 ++------
 .../A_19_PV9.0_STR/components.csv             |  5 ----
 .../A_19_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_19_STR/components.csv                   |  5 ----
 .../A_19_STR/connections.csv                  | 18 ++++-------
 .../A_1_PV80.0_STR/components.csv             |  5 ----
 .../A_1_PV80.0_STR/connections.csv            | 24 ++++++---------
 .../A_1_PV84.0_HP_STR/components.csv          |  7 +----
 .../A_1_PV84.0_HP_STR/connections.csv         | 30 ++++++-------------
 .../A_1_PV84.0_STR/components.csv             |  5 ----
 .../A_1_PV84.0_STR/connections.csv            | 24 ++++++---------
 .../A_1_STR/components.csv                    |  5 ----
 .../A_1_STR/connections.csv                   | 18 ++++-------
 .../A_2/components.csv                        |  5 ----
 .../A_2/connections.csv                       |  8 +----
 .../A_20/components.csv                       |  5 ----
 .../A_20/connections.csv                      |  8 +----
 .../A_20_STR/components.csv                   |  5 ----
 .../A_20_STR/connections.csv                  | 18 ++++-------
 .../A_21/components.csv                       |  5 ----
 .../A_21/connections.csv                      |  8 +----
 .../A_21_PV1.0/components.csv                 |  5 ----
 .../A_21_PV1.0/connections.csv                | 12 ++------
 .../A_21_PV10.0/components.csv                |  5 ----
 .../A_21_PV10.0/connections.csv               | 12 ++------
 .../A_21_PV10.0_STR/components.csv            |  5 ----
 .../A_21_PV10.0_STR/connections.csv           | 24 ++++++---------
 .../A_21_PV28.0/components.csv                |  5 ----
 .../A_21_PV28.0/connections.csv               | 12 ++------
 .../A_21_PV28.0_HP/components.csv             |  7 +----
 .../A_21_PV28.0_HP/connections.csv            | 17 ++---------
 .../A_21_PV28.0_HP_STR/components.csv         |  7 +----
 .../A_21_PV28.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_21_PV28.0_STR/components.csv            |  5 ----
 .../A_21_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_21_PV4.0/components.csv                 |  5 ----
 .../A_21_PV4.0/connections.csv                | 12 ++------
 .../A_21_PV4.0_STR/components.csv             |  5 ----
 .../A_21_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_21_PV5.0/components.csv                 |  5 ----
 .../A_21_PV5.0/connections.csv                | 12 ++------
 .../A_21_PV5.0_STR/components.csv             |  5 ----
 .../A_21_PV5.0_STR/connections.csv            | 24 ++++++---------
 .../A_21_PV9.0/components.csv                 |  5 ----
 .../A_21_PV9.0/connections.csv                | 12 ++------
 .../A_21_PV9.0_STR/components.csv             |  5 ----
 .../A_21_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_21_STR/components.csv                   |  5 ----
 .../A_21_STR/connections.csv                  | 18 ++++-------
 .../A_22/components.csv                       |  5 ----
 .../A_22/connections.csv                      |  8 +----
 .../A_22_PV10.0/components.csv                |  5 ----
 .../A_22_PV10.0/connections.csv               | 12 ++------
 .../A_22_PV10.0_STR/components.csv            |  5 ----
 .../A_22_PV10.0_STR/connections.csv           | 24 ++++++---------
 .../A_22_PV16.0/components.csv                |  5 ----
 .../A_22_PV16.0/connections.csv               | 12 ++------
 .../A_22_PV27.0/components.csv                |  5 ----
 .../A_22_PV27.0/connections.csv               | 12 ++------
 .../A_22_PV27.0_STR/components.csv            |  5 ----
 .../A_22_PV27.0_STR/connections.csv           | 24 ++++++---------
 .../A_22_PV4.0/components.csv                 |  5 ----
 .../A_22_PV4.0/connections.csv                | 12 ++------
 .../A_22_PV5.0/components.csv                 |  5 ----
 .../A_22_PV5.0/connections.csv                | 12 ++------
 .../A_22_PV8.0/components.csv                 |  5 ----
 .../A_22_PV8.0/connections.csv                | 12 ++------
 .../A_22_PV8.0_STR/components.csv             |  5 ----
 .../A_22_PV8.0_STR/connections.csv            | 24 ++++++---------
 .../A_22_PV84.0/components.csv                |  5 ----
 .../A_22_PV84.0/connections.csv               | 12 ++------
 .../A_22_PV84.0_HP_STR/components.csv         |  7 +----
 .../A_22_PV84.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_22_PV84.0_STR/components.csv            |  5 ----
 .../A_22_PV84.0_STR/connections.csv           | 24 ++++++---------
 .../A_22_PV9.0/components.csv                 |  5 ----
 .../A_22_PV9.0/connections.csv                | 12 ++------
 .../A_22_PV9.0_STR/components.csv             |  5 ----
 .../A_22_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_22_STR/components.csv                   |  5 ----
 .../A_22_STR/connections.csv                  | 18 ++++-------
 .../A_23/components.csv                       |  5 ----
 .../A_23/connections.csv                      |  8 +----
 .../A_23_PV152.0_STR/components.csv           |  5 ----
 .../A_23_PV152.0_STR/connections.csv          | 24 ++++++---------
 .../A_23_PV28.0_STR/components.csv            |  5 ----
 .../A_23_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_23_PV80.0_STR/components.csv            |  5 ----
 .../A_23_PV80.0_STR/connections.csv           | 24 ++++++---------
 .../A_23_STR/components.csv                   |  5 ----
 .../A_23_STR/connections.csv                  | 18 ++++-------
 .../A_24/components.csv                       |  5 ----
 .../A_24/connections.csv                      |  8 +----
 .../A_24_PV10.0/components.csv                |  5 ----
 .../A_24_PV10.0/connections.csv               | 12 ++------
 .../A_24_PV10.0_STR/components.csv            |  5 ----
 .../A_24_PV10.0_STR/connections.csv           | 24 ++++++---------
 .../A_24_PV16.0/components.csv                |  5 ----
 .../A_24_PV16.0/connections.csv               | 12 ++------
 .../A_24_PV16.0_STR/components.csv            |  5 ----
 .../A_24_PV16.0_STR/connections.csv           | 24 ++++++---------
 .../A_24_PV27.0_STR/components.csv            |  5 ----
 .../A_24_PV27.0_STR/connections.csv           | 24 ++++++---------
 .../A_24_PV28.0/components.csv                |  5 ----
 .../A_24_PV28.0/connections.csv               | 12 ++------
 .../A_24_PV28.0_STR/components.csv            |  5 ----
 .../A_24_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_24_PV4.0/components.csv                 |  5 ----
 .../A_24_PV4.0/connections.csv                | 12 ++------
 .../A_24_PV4.0_STR/components.csv             |  5 ----
 .../A_24_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_24_PV9.0/components.csv                 |  5 ----
 .../A_24_PV9.0/connections.csv                | 12 ++------
 .../A_24_PV9.0_STR/components.csv             |  5 ----
 .../A_24_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_24_STR/components.csv                   |  5 ----
 .../A_24_STR/connections.csv                  | 18 ++++-------
 .../A_25/components.csv                       |  5 ----
 .../A_25/connections.csv                      |  8 +----
 .../A_25_PV28.0_STR/components.csv            |  5 ----
 .../A_25_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_25_STR/components.csv                   |  5 ----
 .../A_25_STR/connections.csv                  | 18 ++++-------
 .../A_26/components.csv                       |  5 ----
 .../A_26/connections.csv                      |  8 +----
 .../A_26_PV10.0/components.csv                |  5 ----
 .../A_26_PV10.0/connections.csv               | 12 ++------
 .../A_26_PV152.0_HP_STR/components.csv        |  7 +----
 .../A_26_PV152.0_HP_STR/connections.csv       | 30 ++++++-------------
 .../A_26_PV152.0_STR/components.csv           |  5 ----
 .../A_26_PV152.0_STR/connections.csv          | 24 ++++++---------
 .../A_26_PV16.0/components.csv                |  5 ----
 .../A_26_PV16.0/connections.csv               | 12 ++------
 .../A_26_PV16.0_HP/components.csv             |  7 +----
 .../A_26_PV16.0_HP/connections.csv            | 17 ++---------
 .../A_26_PV16.0_STR/components.csv            |  5 ----
 .../A_26_PV16.0_STR/connections.csv           | 24 ++++++---------
 .../A_26_PV27.0/components.csv                |  5 ----
 .../A_26_PV27.0/connections.csv               | 12 ++------
 .../A_26_PV28.0/components.csv                |  5 ----
 .../A_26_PV28.0/connections.csv               | 12 ++------
 .../A_26_PV28.0_HP/components.csv             |  7 +----
 .../A_26_PV28.0_HP/connections.csv            | 17 ++---------
 .../A_26_PV28.0_HP_STR/components.csv         |  7 +----
 .../A_26_PV28.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_26_PV28.0_STR/components.csv            |  5 ----
 .../A_26_PV28.0_STR/connections.csv           | 24 ++++++---------
 .../A_26_PV288.0_HP_STR/components.csv        |  7 +----
 .../A_26_PV288.0_HP_STR/connections.csv       | 30 ++++++-------------
 .../A_26_PV4.0/components.csv                 |  5 ----
 .../A_26_PV4.0/connections.csv                | 12 ++------
 .../A_26_PV4.0_STR/components.csv             |  5 ----
 .../A_26_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_26_PV80.0_STR/components.csv            |  5 ----
 .../A_26_PV80.0_STR/connections.csv           | 24 ++++++---------
 .../A_26_PV9.0/components.csv                 |  5 ----
 .../A_26_PV9.0/connections.csv                | 12 ++------
 .../A_26_STR/components.csv                   |  5 ----
 .../A_26_STR/connections.csv                  | 18 ++++-------
 .../A_27/components.csv                       |  5 ----
 .../A_27/connections.csv                      |  8 +----
 .../A_27_PV1.0/components.csv                 |  5 ----
 .../A_27_PV1.0/connections.csv                | 12 ++------
 .../A_27_PV4.0/components.csv                 |  5 ----
 .../A_27_PV4.0/connections.csv                | 12 ++------
 .../A_27_PV4.0_STR/components.csv             |  5 ----
 .../A_27_PV4.0_STR/connections.csv            | 24 ++++++---------
 .../A_27_PV5.0/components.csv                 |  5 ----
 .../A_27_PV5.0/connections.csv                | 12 ++------
 .../A_27_PV5.0_STR/components.csv             |  5 ----
 .../A_27_PV5.0_STR/connections.csv            | 24 ++++++---------
 .../A_27_PV9.0/components.csv                 |  5 ----
 .../A_27_PV9.0/connections.csv                | 12 ++------
 .../A_27_PV9.0_HP/components.csv              |  7 +----
 .../A_27_PV9.0_HP/connections.csv             | 17 ++---------
 .../A_27_PV9.0_HP_STR/components.csv          |  7 +----
 .../A_27_PV9.0_HP_STR/connections.csv         | 30 ++++++-------------
 .../A_27_PV9.0_STR/components.csv             |  5 ----
 .../A_27_PV9.0_STR/connections.csv            | 24 ++++++---------
 .../A_27_STR/components.csv                   |  5 ----
 .../A_27_STR/connections.csv                  | 18 ++++-------
 .../A_2_PV10.0/components.csv                 |  5 ----
 .../A_2_PV10.0/connections.csv                | 12 ++------
 .../A_2_PV10.0_HP/components.csv              |  7 +----
 .../A_2_PV10.0_HP/connections.csv             | 17 ++---------
 .../A_2_PV10.0_STR/components.csv             |  5 ----
 .../A_2_PV10.0_STR/connections.csv            | 24 ++++++---------
 .../A_2_PV152.0_STR/components.csv            |  5 ----
 .../A_2_PV152.0_STR/connections.csv           | 24 ++++++---------
 .../A_2_PV16.0/components.csv                 |  5 ----
 .../A_2_PV16.0/connections.csv                | 12 ++------
 .../A_2_PV16.0_STR/components.csv             |  5 ----
 .../A_2_PV16.0_STR/connections.csv            | 24 ++++++---------
 .../A_2_PV27.0_STR/components.csv             |  5 ----
 .../A_2_PV27.0_STR/connections.csv            | 24 ++++++---------
 .../A_2_PV28.0_STR/components.csv             |  5 ----
 .../A_2_PV28.0_STR/connections.csv            | 24 ++++++---------
 .../A_2_PV4.0/components.csv                  |  5 ----
 .../A_2_PV4.0/connections.csv                 | 12 ++------
 .../A_2_PV4.0_STR/components.csv              |  5 ----
 .../A_2_PV4.0_STR/connections.csv             | 24 ++++++---------
 .../A_2_PV50.0/components.csv                 |  5 ----
 .../A_2_PV50.0/connections.csv                | 12 ++------
 .../A_2_PV8.0/components.csv                  |  5 ----
 .../A_2_PV8.0/connections.csv                 | 12 ++------
 .../A_2_PV84.0_STR/components.csv             |  5 ----
 .../A_2_PV84.0_STR/connections.csv            | 24 ++++++---------
 .../A_2_PV9.0/components.csv                  |  5 ----
 .../A_2_PV9.0/connections.csv                 | 12 ++------
 .../A_2_PV9.0_STR/components.csv              |  5 ----
 .../A_2_PV9.0_STR/connections.csv             | 24 ++++++---------
 .../A_2_STR/components.csv                    |  5 ----
 .../A_2_STR/connections.csv                   | 18 ++++-------
 .../A_3/components.csv                        |  5 ----
 .../A_3/connections.csv                       |  8 +----
 .../A_3_PV28.0_STR/components.csv             |  5 ----
 .../A_3_PV28.0_STR/connections.csv            | 24 ++++++---------
 .../A_3_PV80.0_STR/components.csv             |  5 ----
 .../A_3_PV80.0_STR/connections.csv            | 24 ++++++---------
 .../A_3_STR/components.csv                    |  5 ----
 .../A_3_STR/connections.csv                   | 18 ++++-------
 .../A_4/components.csv                        |  5 ----
 .../A_4/connections.csv                       |  8 +----
 .../A_4_PV27.0/components.csv                 |  5 ----
 .../A_4_PV27.0/connections.csv                | 12 ++------
 .../A_4_PV27.0_STR/components.csv             |  5 ----
 .../A_4_PV27.0_STR/connections.csv            | 24 ++++++---------
 .../A_4_PV28.0_STR/components.csv             |  5 ----
 .../A_4_PV28.0_STR/connections.csv            | 24 ++++++---------
 .../A_4_PV4.0/components.csv                  |  5 ----
 .../A_4_PV4.0/connections.csv                 | 12 ++------
 .../A_4_PV80.0/components.csv                 |  5 ----
 .../A_4_PV80.0/connections.csv                | 12 ++------
 .../A_4_PV80.0_STR/components.csv             |  5 ----
 .../A_4_PV80.0_STR/connections.csv            | 24 ++++++---------
 .../A_4_PV9.0/components.csv                  |  5 ----
 .../A_4_PV9.0/connections.csv                 | 12 ++------
 .../A_4_STR/components.csv                    |  5 ----
 .../A_4_STR/connections.csv                   | 18 ++++-------
 .../A_5/components.csv                        |  5 ----
 .../A_5/connections.csv                       |  8 +----
 .../A_5_PV10.0/components.csv                 |  5 ----
 .../A_5_PV10.0/connections.csv                | 12 ++------
 .../A_5_PV10.0_STR/components.csv             |  5 ----
 .../A_5_PV10.0_STR/connections.csv            | 24 ++++++---------
 .../A_5_PV16.0/components.csv                 |  5 ----
 .../A_5_PV16.0/connections.csv                | 12 ++------
 .../A_5_PV16.0_STR/components.csv             |  5 ----
 .../A_5_PV16.0_STR/connections.csv            | 24 ++++++---------
 .../A_5_PV27.0_STR/components.csv             |  5 ----
 .../A_5_PV27.0_STR/connections.csv            | 24 ++++++---------
 .../A_5_PV28.0/components.csv                 |  5 ----
 .../A_5_PV28.0/connections.csv                | 12 ++------
 .../A_5_PV28.0_STR/components.csv             |  5 ----
 .../A_5_PV28.0_STR/connections.csv            | 24 ++++++---------
 .../A_5_PV4.0/components.csv                  |  5 ----
 .../A_5_PV4.0/connections.csv                 | 12 ++------
 .../A_5_PV4.0_STR/components.csv              |  5 ----
 .../A_5_PV4.0_STR/connections.csv             | 24 ++++++---------
 .../A_5_PV5.0/components.csv                  |  5 ----
 .../A_5_PV5.0/connections.csv                 | 12 ++------
 .../A_5_PV5.0_STR/components.csv              |  5 ----
 .../A_5_PV5.0_STR/connections.csv             | 24 ++++++---------
 .../A_5_PV8.0/components.csv                  |  5 ----
 .../A_5_PV8.0/connections.csv                 | 12 ++------
 .../A_5_PV8.0_HP/components.csv               |  7 +----
 .../A_5_PV8.0_HP/connections.csv              | 17 ++---------
 .../A_5_PV8.0_STR/components.csv              |  5 ----
 .../A_5_PV8.0_STR/connections.csv             | 24 ++++++---------
 .../A_5_PV9.0/components.csv                  |  5 ----
 .../A_5_PV9.0/connections.csv                 | 12 ++------
 .../A_5_PV9.0_STR/components.csv              |  5 ----
 .../A_5_PV9.0_STR/connections.csv             | 24 ++++++---------
 .../A_5_STR/components.csv                    |  5 ----
 .../A_5_STR/connections.csv                   | 18 ++++-------
 .../A_6_STR/components.csv                    |  5 ----
 .../A_6_STR/connections.csv                   | 18 ++++-------
 .../A_7/components.csv                        |  5 ----
 .../A_7/connections.csv                       |  8 +----
 .../A_7_PV288.0_HP_STR/components.csv         |  7 +----
 .../A_7_PV288.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_7_STR/components.csv                    |  5 ----
 .../A_7_STR/connections.csv                   | 18 ++++-------
 .../A_8/components.csv                        |  5 ----
 .../A_8/connections.csv                       |  8 +----
 .../A_8_PV27.0/components.csv                 |  5 ----
 .../A_8_PV27.0/connections.csv                | 12 ++------
 .../A_8_PV27.0_STR/components.csv             |  5 ----
 .../A_8_PV27.0_STR/connections.csv            | 24 ++++++---------
 .../A_8_PV390.0_HP_STR/components.csv         |  7 +----
 .../A_8_PV390.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_8_STR/components.csv                    |  5 ----
 .../A_8_STR/connections.csv                   | 18 ++++-------
 .../A_9/components.csv                        |  5 ----
 .../A_9/connections.csv                       |  8 +----
 .../A_9_PV10.0/components.csv                 |  5 ----
 .../A_9_PV10.0/connections.csv                | 12 ++------
 .../A_9_PV10.0_STR/components.csv             |  5 ----
 .../A_9_PV10.0_STR/connections.csv            | 24 ++++++---------
 .../A_9_PV152.0_HP_STR/components.csv         |  7 +----
 .../A_9_PV152.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../A_9_PV152.0_STR/components.csv            |  5 ----
 .../A_9_PV152.0_STR/connections.csv           | 24 ++++++---------
 .../A_9_PV16.0/components.csv                 |  5 ----
 .../A_9_PV16.0/connections.csv                | 12 ++------
 .../A_9_PV16.0_STR/components.csv             |  5 ----
 .../A_9_PV16.0_STR/connections.csv            | 24 ++++++---------
 .../A_9_PV27.0_STR/components.csv             |  5 ----
 .../A_9_PV27.0_STR/connections.csv            | 24 ++++++---------
 .../A_9_PV4.0/components.csv                  |  5 ----
 .../A_9_PV4.0/connections.csv                 | 12 ++------
 .../A_9_PV50.0/components.csv                 |  5 ----
 .../A_9_PV50.0/connections.csv                | 12 ++------
 .../A_9_PV50.0_HP_STR/components.csv          |  7 +----
 .../A_9_PV50.0_HP_STR/connections.csv         | 30 ++++++-------------
 .../A_9_PV8.0/components.csv                  |  5 ----
 .../A_9_PV8.0/connections.csv                 | 12 ++------
 .../A_9_PV9.0/components.csv                  |  5 ----
 .../A_9_PV9.0/connections.csv                 | 12 ++------
 .../A_9_PV9.0_STR/components.csv              |  5 ----
 .../A_9_PV9.0_STR/connections.csv             | 24 ++++++---------
 .../A_9_STR/components.csv                    |  5 ----
 .../A_9_STR/connections.csv                   | 18 ++++-------
 .../B_0/components.csv                        |  5 ----
 .../B_0/connections.csv                       |  8 +----
 .../C_0/components.csv                        |  5 ----
 .../C_0/connections.csv                       |  8 +----
 .../C_0_PV103.0_STR/components.csv            |  5 ----
 .../C_0_PV103.0_STR/connections.csv           | 24 ++++++---------
 .../C_0_PV112.0/components.csv                |  5 ----
 .../C_0_PV112.0/connections.csv               | 12 ++------
 .../C_0_PV25.0/components.csv                 |  5 ----
 .../C_0_PV25.0/connections.csv                | 12 ++------
 .../C_0_PV30.0/components.csv                 |  5 ----
 .../C_0_PV30.0/connections.csv                | 12 ++------
 .../C_0_PV30.0_HP/components.csv              |  7 +----
 .../C_0_PV30.0_HP/connections.csv             | 17 ++---------
 .../C_0_PV678.0_HP_STR/components.csv         |  7 +----
 .../C_0_PV678.0_HP_STR/connections.csv        | 30 ++++++-------------
 .../C_0_PV7.0/components.csv                  |  5 ----
 .../C_0_PV7.0/connections.csv                 | 12 ++------
 .../C_0_PV73.0/components.csv                 |  5 ----
 .../C_0_PV73.0/connections.csv                | 12 ++------
 .../C_0_PV8.0/components.csv                  |  5 ----
 .../C_0_PV8.0/connections.csv                 | 12 ++------
 .../C_0_PV8.0_HP/components.csv               |  7 +----
 .../C_0_PV8.0_HP/connections.csv              | 17 ++---------
 .../C_1/components.csv                        |  5 ----
 .../C_1/connections.csv                       |  8 +----
 .../C_1_STR/components.csv                    |  5 ----
 .../C_1_STR/connections.csv                   | 18 ++++-------
 .../D_0/components.csv                        |  5 ----
 .../D_0/connections.csv                       |  8 +----
 .../D_0_PV30.0/components.csv                 |  5 ----
 .../D_0_PV30.0/connections.csv                | 12 ++------
 .../D_0_PV7.0/components.csv                  |  5 ----
 .../D_0_PV7.0/connections.csv                 | 12 ++------
 .../D_0_PV73.0/components.csv                 |  5 ----
 .../D_0_PV73.0/connections.csv                | 12 ++------
 .../D_0_PV8.0/components.csv                  |  5 ----
 .../D_0_PV8.0/connections.csv                 | 12 ++------
 .../D_1/components.csv                        |  5 ----
 .../D_1/connections.csv                       |  8 +----
 .../D_1_PV103.0/components.csv                |  5 ----
 .../D_1_PV103.0/connections.csv               | 12 ++------
 .../D_2/components.csv                        |  5 ----
 .../D_2/connections.csv                       |  8 +----
 .../D_2_PV390.0_STR/components.csv            |  5 ----
 .../D_2_PV390.0_STR/connections.csv           | 24 ++++++---------
 .../D_2_PV8.0/components.csv                  |  5 ----
 .../D_2_PV8.0/connections.csv                 | 12 ++------
 .../E_0/components.csv                        |  5 ----
 .../E_0/connections.csv                       |  8 +----
 .../E_0_PV25.0/components.csv                 |  5 ----
 .../E_0_PV25.0/connections.csv                | 12 ++------
 .../E_0_PV30.0/components.csv                 |  5 ----
 .../E_0_PV30.0/connections.csv                | 12 ++------
 .../E_0_PV53.0/components.csv                 |  5 ----
 .../E_0_PV53.0/connections.csv                | 12 ++------
 .../E_0_PV7.0/components.csv                  |  5 ----
 .../E_0_PV7.0/connections.csv                 | 12 ++------
 .../E_0_PV8.0/components.csv                  |  5 ----
 .../E_0_PV8.0/connections.csv                 | 12 ++------
 .../E_0_PV8.0_STR/components.csv              |  5 ----
 .../E_0_PV8.0_STR/connections.csv             | 24 ++++++---------
 .../E_1/components.csv                        |  5 ----
 .../E_1/connections.csv                       |  8 +----
 .../G_0/components.csv                        |  5 ----
 .../G_0/connections.csv                       |  8 +----
 .../G_0_PV103.0/components.csv                |  5 ----
 .../G_0_PV103.0/connections.csv               | 12 ++------
 .../G_0_PV112.0_STR/components.csv            |  5 ----
 .../G_0_PV112.0_STR/connections.csv           | 24 ++++++---------
 .../G_1/components.csv                        |  5 ----
 .../G_1/connections.csv                       |  8 +----
 .../G_1_PV112.0_STR/components.csv            |  5 ----
 .../G_1_PV112.0_STR/connections.csv           | 24 ++++++---------
 .../G_1_PV25.0/components.csv                 |  5 ----
 .../G_1_PV25.0/connections.csv                | 12 ++------
 .../G_1_PV30.0/components.csv                 |  5 ----
 .../G_1_PV30.0/connections.csv                | 12 ++------
 .../G_1_PV30.0_HP/components.csv              |  7 +----
 .../G_1_PV30.0_HP/connections.csv             | 17 ++---------
 .../G_1_PV30.0_STR/components.csv             |  5 ----
 .../G_1_PV30.0_STR/connections.csv            | 24 ++++++---------
 .../G_1_PV7.0/components.csv                  |  5 ----
 .../G_1_PV7.0/connections.csv                 | 12 ++------
 .../G_1_PV7.0_STR/components.csv              |  5 ----
 .../G_1_PV7.0_STR/connections.csv             | 24 ++++++---------
 .../G_1_PV8.0/components.csv                  |  5 ----
 .../G_1_PV8.0/connections.csv                 | 12 ++------
 .../I_0/components.csv                        |  5 ----
 .../I_0/connections.csv                       |  8 +----
 .../I_1/components.csv                        |  5 ----
 .../I_1/connections.csv                       |  8 +----
 .../L_0/components.csv                        |  5 ----
 .../L_0/connections.csv                       |  8 +----
 .../L_0_PV30.0/components.csv                 |  5 ----
 .../L_0_PV30.0/connections.csv                | 12 ++------
 .../L_0_PV30.0_STR/components.csv             |  5 ----
 .../L_0_PV30.0_STR/connections.csv            | 24 ++++++---------
 .../L_0_PV7.0/components.csv                  |  5 ----
 .../L_0_PV7.0/connections.csv                 | 12 ++------
 .../L_0_PV73.0/components.csv                 |  5 ----
 .../L_0_PV73.0/connections.csv                | 12 ++------
 .../L_0_PV79.0/components.csv                 |  5 ----
 .../L_0_PV79.0/connections.csv                | 12 ++------
 .../L_0_PV8.0/components.csv                  |  5 ----
 .../L_0_PV8.0/connections.csv                 | 12 ++------
 .../L_0_STR/components.csv                    |  5 ----
 .../L_0_STR/connections.csv                   | 18 ++++-------
 .../L_1/components.csv                        |  5 ----
 .../L_1/connections.csv                       |  8 +----
 .../L_1_STR/components.csv                    |  5 ----
 .../L_1_STR/connections.csv                   | 18 ++++-------
 .../N_0/components.csv                        |  5 ----
 .../N_0/connections.csv                       |  8 +----
 .../N_0_PV112.0/components.csv                |  5 ----
 .../N_0_PV112.0/connections.csv               | 12 ++------
 .../N_0_PV30.0/components.csv                 |  5 ----
 .../N_0_PV30.0/connections.csv                | 12 ++------
 .../N_0_PV30.0_STR/components.csv             |  5 ----
 .../N_0_PV30.0_STR/connections.csv            | 24 ++++++---------
 .../N_0_PV390.0_STR/components.csv            |  5 ----
 .../N_0_PV390.0_STR/connections.csv           | 24 ++++++---------
 .../N_0_PV7.0/components.csv                  |  5 ----
 .../N_0_PV7.0/connections.csv                 | 12 ++------
 .../N_0_PV73.0_HP/components.csv              |  7 +----
 .../N_0_PV73.0_HP/connections.csv             | 17 ++---------
 .../N_0_PV8.0/components.csv                  |  5 ----
 .../N_0_PV8.0/connections.csv                 | 12 ++------
 .../N_0_PV8.0_STR/components.csv              |  5 ----
 .../N_0_PV8.0_STR/connections.csv             | 24 ++++++---------
 .../N_0_STR/components.csv                    |  5 ----
 .../N_0_STR/connections.csv                   | 18 ++++-------
 .../N_1/components.csv                        |  5 ----
 .../N_1/connections.csv                       |  8 +----
 .../N_1_STR/components.csv                    |  5 ----
 .../N_1_STR/connections.csv                   | 18 ++++-------
 .../Q_0/components.csv                        |  5 ----
 .../Q_0/connections.csv                       |  8 +----
 .../Q_0_PV30.0/components.csv                 |  5 ----
 .../Q_0_PV30.0/connections.csv                | 12 ++------
 .../Q_0_PV7.0/components.csv                  |  5 ----
 .../Q_0_PV7.0/connections.csv                 | 12 ++------
 .../Q_0_PV73.0/components.csv                 |  5 ----
 .../Q_0_PV73.0/connections.csv                | 12 ++------
 .../Q_0_PV8.0/components.csv                  |  5 ----
 .../Q_0_PV8.0/connections.csv                 | 12 ++------
 .../Q_0_STR/components.csv                    |  5 ----
 .../Q_0_STR/connections.csv                   | 18 ++++-------
 .../Q_1/components.csv                        |  5 ----
 .../Q_1/connections.csv                       |  8 +----
 .../Q_2/components.csv                        |  5 ----
 .../Q_2/connections.csv                       |  8 +----
 .../R_0/components.csv                        |  5 ----
 .../R_0/connections.csv                       |  8 +----
 .../R_0_PV30.0/components.csv                 |  5 ----
 .../R_0_PV30.0/connections.csv                | 12 ++------
 .../R_0_PV53.0/components.csv                 |  5 ----
 .../R_0_PV53.0/connections.csv                | 12 ++------
 .../R_0_PV8.0/components.csv                  |  5 ----
 .../R_0_PV8.0/connections.csv                 | 12 ++------
 .../R_1/components.csv                        |  5 ----
 .../R_1/connections.csv                       |  8 +----
 .../S_0/components.csv                        |  5 ----
 .../S_0/connections.csv                       |  8 +----
 .../S_1/components.csv                        |  5 ----
 .../S_1/connections.csv                       |  8 +----
 .../S_2/components.csv                        |  5 ----
 .../S_2/connections.csv                       |  8 +----
 .../S_3/components.csv                        |  5 ----
 .../S_3/connections.csv                       |  8 +----
 .../U_0/components.csv                        |  5 ----
 .../U_0/connections.csv                       |  8 +----
 .../U_0_PV73.0/components.csv                 |  5 ----
 .../U_0_PV73.0/connections.csv                | 12 ++------
 .../U_0_PV73.0_STR/components.csv             |  5 ----
 .../U_0_PV73.0_STR/connections.csv            | 24 ++++++---------
 .../U_0_PV8.0/components.csv                  |  5 ----
 .../U_0_PV8.0/connections.csv                 | 12 ++------
 .../U_1/components.csv                        |  5 ----
 .../U_1/connections.csv                       |  8 +----
 .../U_2/components.csv                        |  5 ----
 .../U_2/connections.csv                       |  8 +----
 .../V_0/components.csv                        |  5 ----
 .../V_0/connections.csv                       |  8 +----
 .../V_0_PV7.0/components.csv                  |  5 ----
 .../V_0_PV7.0/connections.csv                 | 12 ++------
 .../V_1/components.csv                        |  5 ----
 .../V_1/connections.csv                       |  8 +----
 .../V_2/components.csv                        |  5 ----
 .../V_2/connections.csv                       |  8 +----
 .../V_2_PV30.0/components.csv                 |  5 ----
 .../V_2_PV30.0/connections.csv                | 12 ++------
 .../V_3/components.csv                        |  5 ----
 .../V_3/connections.csv                       |  8 +----
 runme.py                                      | 10 ++-----
 840 files changed, 2118 insertions(+), 7002 deletions(-)

diff --git a/Model_Library b/Model_Library
index c9a8706272..c02cc107f7 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 ed4b30f81c..9832587e63 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 179ef43034..1bb52ceb00 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 c17f506465..9c7cfc4441 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 179ef43034..1bb52ceb00 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 82b4814e54..8085dde2e5 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 0e8994f1a2..1bb52ceb00 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 b098ba5d48..026ac2c10a 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 1659cfac6a..20bc94fbda 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 e779831a89..467f776fdf 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 1659cfac6a..20bc94fbda 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 e05c113117..75f5c26e89 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 179ef43034..1bb52ceb00 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 f2a82cb55c..5c801d39c6 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 a9a7f77afe..441c15f615 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 0e8994f1a2..1bb52ceb00 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 f3378ee0ad..955e9b0f34 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 bfccd7b29a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 6e0b364f58..57eb1cba18 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 179ef43034..1bb52ceb00 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 ac688ea7d9..a9d0508c36 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 179ef43034..1bb52ceb00 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 6efd0adb2e..08fa48fe98 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 0e8994f1a2..1bb52ceb00 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 52b4aef8c1..690316ebd1 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 bfccd7b29a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 4bde9ff7a0..0c34b3a7b7 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 1659cfac6a..20bc94fbda 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 bf4abf603f..ec139429d5 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 1659cfac6a..20bc94fbda 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 d1c7d27713..4281771fb8 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 0e8994f1a2..1bb52ceb00 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 a22d694377..051463bc10 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 896a63d59b..e5c61c71aa 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 0e8994f1a2..1bb52ceb00 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 07bd340eb0..6bd7328cc1 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 bfccd7b29a..20bc94fbda 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 2472e8a4e0..d9cde35f91 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 bfccd7b29a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2472e8a4e0..d9cde35f91 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 bfccd7b29a..20bc94fbda 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 e89bd28a6a..a47e197a17 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 1659cfac6a..20bc94fbda 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 2472e8a4e0..d9cde35f91 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 bfccd7b29a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 37a3bfa7b6..a62c5880af 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 179ef43034..1bb52ceb00 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 bd2d0e229b..2536a9d120 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 1659cfac6a..20bc94fbda 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 b75fa93510..40ab2e0d14 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 bfccd7b29a..20bc94fbda 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 6fa97b7d5f..319bd24153 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 52b4aef8c1..690316ebd1 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 bfccd7b29a..20bc94fbda 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 6fa97b7d5f..319bd24153 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 95b72804f3..2e4ad31723 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 0e8994f1a2..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 6efd0adb2e..08fa48fe98 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 0e8994f1a2..1bb52ceb00 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 52b4aef8c1..690316ebd1 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 bfccd7b29a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 804782a6e0..c01be76838 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 179ef43034..1bb52ceb00 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 54387d17da..18ed7bd542 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 0e8994f1a2..1bb52ceb00 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 4bde9ff7a0..0c34b3a7b7 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 1659cfac6a..20bc94fbda 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 bf4abf603f..ec139429d5 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 1659cfac6a..20bc94fbda 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 a22d694377..051463bc10 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 37a3bfa7b6..a62c5880af 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 179ef43034..1bb52ceb00 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 f54535bd77..b1949b8150 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 1659cfac6a..20bc94fbda 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 bf4abf603f..ec139429d5 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 1659cfac6a..20bc94fbda 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 a22d694377..051463bc10 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 1659cfac6a..20bc94fbda 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 bed0794858..d6e5ccbc4e 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 179ef43034..1bb52ceb00 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 e3d4f7e87e..e249bf6874 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 bfccd7b29a..20bc94fbda 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 0e8a195cc0..7514e8cab3 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 896a63d59b..e5c61c71aa 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 0e8994f1a2..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 ac688ea7d9..a9d0508c36 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 179ef43034..1bb52ceb00 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 944b35bdad..ee23fa29fe 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 54387d17da..18ed7bd542 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 0e8994f1a2..1bb52ceb00 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 f54535bd77..b1949b8150 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 896a63d59b..e5c61c71aa 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 0e8994f1a2..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 37a3bfa7b6..a62c5880af 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 179ef43034..1bb52ceb00 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 52b4aef8c1..690316ebd1 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 bfccd7b29a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 d7385ffa26..c1b29079a0 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 1659cfac6a..20bc94fbda 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 bd2d0e229b..2536a9d120 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 1659cfac6a..20bc94fbda 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 b75fa93510..40ab2e0d14 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 bfccd7b29a..20bc94fbda 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 0e8a195cc0..7514e8cab3 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 1659cfac6a..20bc94fbda 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 d6ed42866d..0be1ee3a97 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 bfccd7b29a..20bc94fbda 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 95b72804f3..2e4ad31723 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 0e8994f1a2..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 52b4aef8c1..690316ebd1 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 bfccd7b29a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 f54535bd77..b1949b8150 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 1659cfac6a..20bc94fbda 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 bf4abf603f..ec139429d5 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 1659cfac6a..20bc94fbda 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 d1c7d27713..4281771fb8 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 0e8994f1a2..1bb52ceb00 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 a22d694377..051463bc10 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 6fa97b7d5f..319bd24153 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 1659cfac6a..20bc94fbda 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 e3d4f7e87e..e249bf6874 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 bfccd7b29a..20bc94fbda 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 0e8a195cc0..7514e8cab3 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 ac688ea7d9..a9d0508c36 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 179ef43034..1bb52ceb00 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 6efd0adb2e..08fa48fe98 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 0e8994f1a2..1bb52ceb00 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 52b4aef8c1..690316ebd1 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 bfccd7b29a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 804782a6e0..c01be76838 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 179ef43034..1bb52ceb00 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 4bde9ff7a0..0c34b3a7b7 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 1659cfac6a..20bc94fbda 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 bf4abf603f..ec139429d5 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 37a3bfa7b6..a62c5880af 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 179ef43034..1bb52ceb00 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 a22d694377..051463bc10 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 1659cfac6a..20bc94fbda 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 bed0794858..d6e5ccbc4e 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 179ef43034..1bb52ceb00 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 e3d4f7e87e..e249bf6874 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 bfccd7b29a..20bc94fbda 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 0e8a195cc0..7514e8cab3 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 e89bd28a6a..a47e197a17 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 1659cfac6a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 6fa97b7d5f..319bd24153 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 f54535bd77..b1949b8150 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2472e8a4e0..d9cde35f91 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 bfccd7b29a..20bc94fbda 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 e89bd28a6a..a47e197a17 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 63b44bd0ab..de3697b7b8 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 0e8994f1a2..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 37a3bfa7b6..a62c5880af 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 179ef43034..1bb52ceb00 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 6efd0adb2e..08fa48fe98 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 0e8994f1a2..1bb52ceb00 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 52b4aef8c1..690316ebd1 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 bfccd7b29a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 62eaa0801f..c6ceffdd44 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 bfccd7b29a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 f54535bd77..b1949b8150 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 1659cfac6a..20bc94fbda 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 6fa97b7d5f..319bd24153 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 ac688ea7d9..a9d0508c36 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 179ef43034..1bb52ceb00 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 804782a6e0..c01be76838 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 179ef43034..1bb52ceb00 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 4bde9ff7a0..0c34b3a7b7 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 1659cfac6a..20bc94fbda 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 bf4abf603f..ec139429d5 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 896a63d59b..e5c61c71aa 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 0e8994f1a2..1bb52ceb00 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 07bd340eb0..6bd7328cc1 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 bfccd7b29a..20bc94fbda 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 95b72804f3..2e4ad31723 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 0e8994f1a2..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 e89bd28a6a..a47e197a17 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 f54535bd77..b1949b8150 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 1659cfac6a..20bc94fbda 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 672eb8341f..f1e98b5c46 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 179ef43034..1bb52ceb00 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 0e8a195cc0..7514e8cab3 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 6fa97b7d5f..319bd24153 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 37a3bfa7b6..a62c5880af 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 179ef43034..1bb52ceb00 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 f5028ed1e7..7c0ea5a2e8 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 179ef43034..1bb52ceb00 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 6fa97b7d5f..319bd24153 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 c8a170b3cc..962c7b6f52 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 179ef43034..1bb52ceb00 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 95de553ffe..a143669e5c 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 f54535bd77..b1949b8150 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 1659cfac6a..20bc94fbda 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 4b638d66ed..6339bebd20 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 179ef43034..1bb52ceb00 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 bf4abf603f..ec139429d5 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 1659cfac6a..20bc94fbda 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 d1c7d27713..4281771fb8 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 0e8994f1a2..1bb52ceb00 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 a22d694377..051463bc10 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 1659cfac6a..20bc94fbda 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 62eaa0801f..c6ceffdd44 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 bfccd7b29a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 37a3bfa7b6..a62c5880af 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 179ef43034..1bb52ceb00 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 d6ed42866d..0be1ee3a97 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 bfccd7b29a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 b8f946a4ca..1c71d20bb5 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 179ef43034..1bb52ceb00 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 2a7170686a..c3636c99c1 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 1659cfac6a..20bc94fbda 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 2472e8a4e0..d9cde35f91 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 bfccd7b29a..20bc94fbda 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 e89bd28a6a..a47e197a17 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 1659cfac6a..20bc94fbda 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 1f6a51b283..8eb969e7e3 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 179ef43034..1bb52ceb00 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 d816cf2452..384206a45f 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 1659cfac6a..20bc94fbda 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 49b6459a78..4013794050 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 1659cfac6a..20bc94fbda 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 faa51fa8ed..32a9457a10 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 179ef43034..1bb52ceb00 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 672eb8341f..f1e98b5c46 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 179ef43034..1bb52ceb00 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 336574395e..0ce3ed5def 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 bfccd7b29a..20bc94fbda 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 6e12b992cc..062e4be6b5 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 179ef43034..1bb52ceb00 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 38e3dfb3b7..765a12fcfc 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 179ef43034..1bb52ceb00 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 01cb81321d..c4cad03c2e 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 9578e7f95e..d0bb9e297f 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 1659cfac6a..20bc94fbda 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 6e0b364f58..57eb1cba18 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 179ef43034..1bb52ceb00 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 c17f506465..9c7cfc4441 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 179ef43034..1bb52ceb00 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 82b4814e54..8085dde2e5 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 0e8994f1a2..1bb52ceb00 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 675d678d30..6fcf77bbeb 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 bfccd7b29a..20bc94fbda 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 e05c113117..75f5c26e89 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 a9a7f77afe..441c15f615 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 0e8994f1a2..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 e05c113117..75f5c26e89 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 4b8c479614..b91b8e4d10 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 d7385ffa26..c1b29079a0 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 1659cfac6a..20bc94fbda 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 c17f506465..9c7cfc4441 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 179ef43034..1bb52ceb00 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 5ef69dea9a..adeb0dc09e 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 179ef43034..1bb52ceb00 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 a135eae77a..fa80863238 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 1659cfac6a..20bc94fbda 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 4b8c479614..b91b8e4d10 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 179ef43034..1bb52ceb00 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 63dd45a932..8d09721d33 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 1659cfac6a..20bc94fbda 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 63dd45a932..8d09721d33 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 1659cfac6a..20bc94fbda 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 c17f506465..9c7cfc4441 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 179ef43034..1bb52ceb00 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 82b4814e54..8085dde2e5 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 0e8994f1a2..1bb52ceb00 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 b098ba5d48..026ac2c10a 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 1659cfac6a..20bc94fbda 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 e779831a89..467f776fdf 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 1659cfac6a..20bc94fbda 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 b098ba5d48..026ac2c10a 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 1659cfac6a..20bc94fbda 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 e05c113117..75f5c26e89 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 179ef43034..1bb52ceb00 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 f2a82cb55c..5c801d39c6 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 6e0b364f58..57eb1cba18 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 179ef43034..1bb52ceb00 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 b098ba5d48..026ac2c10a 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 1659cfac6a..20bc94fbda 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 d7385ffa26..c1b29079a0 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 1659cfac6a..20bc94fbda 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 68df4f9601..af5fe49846 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 0e8994f1a2..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 a135eae77a..fa80863238 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 1659cfac6a..20bc94fbda 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 e05c113117..75f5c26e89 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 305fc870ab..90690b95b5 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 13a3d01ed6..a2636dd09f 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 5ef69dea9a..adeb0dc09e 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 179ef43034..1bb52ceb00 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 e05c113117..75f5c26e89 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 179ef43034..1bb52ceb00 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 fba67b8e7b..32db003061 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 1659cfac6a..20bc94fbda 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 4f68e68a8c..445dd73114 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 8f8b647a14..4ad2650c50 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 21be468395..c71b3fd25e 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 179ef43034..1bb52ceb00 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 bc4946ab0e..9688117b3e 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 815996b039..2c4dc31d64 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 883e4a87c9..18a464ddc6 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'])}}
 
 
 
-- 
GitLab