diff --git a/configuration.yaml b/configuration.yaml
index 5af1083..821cbd5 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -142,22 +142,6 @@ influxdb:
       - sensor
 
 template:
-  - switch:
-    - turn_on:
-      - data:
-          entity_id: homematic.ccu2
-          name: ThunderstormMode
-          value: true
-        action: homematic.set_variable_value
-    - turn_off:
-      - data:
-          entity_id: homematic.ccu2
-          name: ThunderstormMode
-          value: false
-        action: homematic.set_variable_value
-      default_entity_id: switch.ccu_tsm
-      state: '{{ is_state("binary_sensor.ccu_thunderstorm_mode","on") }}'
-      name: ccu_tsm
   - switch:
     - turn_on:
       - action: script.fernsehschauenstarten
@@ -240,11 +224,6 @@ template:
       state: '{{ states.sun.sun.attributes.elevation }}'
       name: sun_elevation
 
-  - sensor:
-    - default_entity_id: sensor.ccu_service_meldungen
-      name: CCU Servicemeldungen
-      state: '{{ states.homematic.ccu2.state | int }}'
-
   - sensor:
     - name: Wohnzimmer Harmony
       default_entity_id: sensor.remote_wohnzimmer_activity