diff --git a/packages/base.yaml b/packages/base.yaml
index e10e0d1e58367880d16263bd7edcd66cf64561e2..71172bcd393d8b7851411f41da88e18647b6b0e0 100644
--- a/packages/base.yaml
+++ b/packages/base.yaml
@@ -34,11 +34,6 @@ wifi:
   #fast_connect: on
   reboot_timeout: 1min
   use_address: ${devicename}.${domain}
-  ap:
-    ssid: "$devicename Fallback Hotspot"
-    password: !secret wifi_password
-
-captive_portal:
 
 web_server:
   port: 80
@@ -71,21 +66,6 @@ text_sensor:
     name: "ESPHome Version"
     hide_timestamp: true
 
-  - platform: template
-    name: "Device Time"
-    lambda: |-
-      auto str_time = id(sntp_time).now().strftime("%d-%m-%Y %H:%M");
-      return { str_time };
-    update_interval: 60s
-
-  - platform: wifi_info
-    ip_address:
-      name: "Wifi IP Address"
-    ssid:
-      name: "Wifi SSID"
-    bssid:
-      name: "Wifi BSSID"
-
 button:
   - platform: restart
     name: "Device Restart"
diff --git a/packages/ec.yaml b/packages/ec.yaml
index bb3918987f11959cf72a1363f141d28ef805118b..6490c10cd615ccd35f733e1ed87fa5b94968696d 100644
--- a/packages/ec.yaml
+++ b/packages/ec.yaml
@@ -18,13 +18,13 @@ sensor:
     gain: 4.096 # max: 3.4V
     update_interval: 5s
     accuracy_decimals: 5
-    #<<: !include filter.yaml
-  - platform: template
-    name: "EC: K Value"
-    unit_of_measurement: "K"
-    accuracy_decimals: 5
-    update_interval: 5s
-    lambda: !lambda return id(ec_k);
+    <<: !include filter.yaml
+  # - platform: template
+  #   name: "EC: K Value"
+  #   unit_of_measurement: "K"
+  #   accuracy_decimals: 5
+  #   update_interval: 5s
+  #   lambda: !lambda return id(ec_k);
   - platform: template
     name: "EC:"
     id: ec
diff --git a/packages/ph.yaml b/packages/ph.yaml
index db659fc8646d9498727b76d9acdb9f93c46f3ceb..ffd1f3cc1fcb55fa849959d3b76d26a74c2f2200 100644
--- a/packages/ph.yaml
+++ b/packages/ph.yaml
@@ -30,31 +30,31 @@ sensor:
     gain: 4.096 # max: 3.0V
     update_interval: 5s
     accuracy_decimals: 5
-    #<<: !include filter.yaml
-  - platform: template
-    name: "pH: 4.00 Calibration Value"
-    unit_of_measurement: "V"
-    accuracy_decimals: 5
-    update_interval: 5s
-    lambda: !lambda return id(ph400_raw);
-  - platform: template
-    name: "pH: 6.86 Calibration Value"
-    unit_of_measurement: "V"
-    accuracy_decimals: 5
-    update_interval: 5s
-    lambda: !lambda return id(ph686_raw);
-  - platform: template
-    name: "pH: 7.00 Calibration Value"
-    unit_of_measurement: "V"
-    accuracy_decimals: 5
-    update_interval: 5s
-    lambda: !lambda return id(ph700_raw);
-  - platform: template
-    name: "pH: 9.18 Calibration Value"
-    unit_of_measurement: "V"
-    accuracy_decimals: 5
-    update_interval: 5s
-    lambda: !lambda return id(ph918_raw);
+    <<: !include filter.yaml
+  # - platform: template
+  #   name: "pH: 4.00 Calibration Value"
+  #   unit_of_measurement: "V"
+  #   accuracy_decimals: 5
+  #   update_interval: 5s
+  #   lambda: !lambda return id(ph400_raw);
+  # - platform: template
+  #   name: "pH: 6.86 Calibration Value"
+  #   unit_of_measurement: "V"
+  #   accuracy_decimals: 5
+  #   update_interval: 5s
+  #   lambda: !lambda return id(ph686_raw);
+  # - platform: template
+  #   name: "pH: 7.00 Calibration Value"
+  #   unit_of_measurement: "V"
+  #   accuracy_decimals: 5
+  #   update_interval: 5s
+  #   lambda: !lambda return id(ph700_raw);
+  # - platform: template
+  #   name: "pH: 9.18 Calibration Value"
+  #   unit_of_measurement: "V"
+  #   accuracy_decimals: 5
+  #   update_interval: 5s
+  #   lambda: !lambda return id(ph918_raw);
   - platform: template
     name: "pH:"
     id: ph