diff --git a/config/packages/space.yaml b/config/packages/space.yaml
index 4326197..29a3568 100755
--- a/config/packages/space.yaml
+++ b/config/packages/space.yaml
@@ -125,18 +125,18 @@ automation:
         state: 'full_moon'
     action:
       - service: script.jarvis_voice
-      data_template:
-        who: '{{ states.sensor.room_audio.state }}'
-        message: >
-          <p>
-            {{ [
-            'There is a Full Moon out tonight. and this time it is the <emphasis>actual</emphasis> moon. And <emphasis>not</emphasis> the neighbor. ',
-            'Hey look, There is the full moon. ',
-            'The moon is <emphasis>huge<e/mphasis>! And full. ',
-            'If you went outside right now you might see the full moon. <break time="2s"/> Of course if you wait long enough there will be one inside the house too. ',
-            'If you want to see the full moon, <emphasis>tonight is the night</emphasis>.'] 
-            | random }}
-          </p>
+        data_template:
+          who: '{{ states.sensor.room_audio.state }}'
+          message: >
+            <p>
+              {{ [
+              'There is a Full Moon out tonight. and this time it is the <emphasis>actual</emphasis> moon. And <emphasis>not</emphasis> the neighbor. ',
+              'Hey look, There is the full moon. ',
+              'The moon is <emphasis>huge<e/mphasis>! And full. ',
+              'If you went outside right now you might see the full moon. <break time="2s"/> Of course if you wait long enough there will be one inside the house too. ',
+              'If you want to see the full moon, <emphasis>tonight is the night</emphasis>.'] 
+              | random }}
+            </p>
       - service: script.twitter_notify_image
         data_template:
           tweet: >-
diff --git a/config/packages/usps.yaml b/config/packages/usps.yaml
index d601a10..e100b34 100755
--- a/config/packages/usps.yaml
+++ b/config/packages/usps.yaml
@@ -30,11 +30,6 @@ sensor:
     sensors:
       mail_deliveries_message:
         friendly_name: "Deliveries Summary"
-        entity_id: 
-          - sensor.mail_usps_mail
-          - sensor.mail_usps_delivering
-          - sensor.mail_fedex_delivering_2
-          - sensor.mail_ups_delivering
         value_template: > 
           {# Deliveries Sentence #}
             {% macro deliveries_sentence() -%}
diff --git a/config/packages/weather.yaml b/config/packages/weather.yaml
index e73cd52..72a9071 100755
--- a/config/packages/weather.yaml
+++ b/config/packages/weather.yaml
@@ -88,7 +88,6 @@ sensor:
     sensors:
       flood_watch:
         friendly_name: 'Flood Watch'
-        entity_id: sensor.time
         value_template: >-
             {% if states.sensor.nws_alerts.state | int > 0  %}
               {% if 'Flood Watch' in states.sensor.nws_alerts.attributes.title.split(' - ')[0] or
@@ -106,7 +105,6 @@ sensor:
           
       flood_warning:
         friendly_name: 'Flood Warning'
-        entity_id: sensor.time
         value_template: >-
             {% if states.sensor.nws_alerts.state | int > 0  %}
               {% if 'Flood Warning' in states.sensor.nws_alerts.attributes.title.split(' - ')[0] or
@@ -123,7 +121,6 @@ sensor:
             {% endif %}
       tstorm_warning:
         friendly_name: 'Thunderstorm Warning'
-        entity_id: sensor.time
         value_template: >-
           {% if states.sensor.nws_alerts.state | int > 0  %}
             {% if 'Thunderstorm Warning' in states.sensor.nws_alerts.attributes.title.split(' - ')[0] or
@@ -140,7 +137,6 @@ sensor:
           {% endif %}
       tstorm_watch:
         friendly_name: 'Thunderstorm Watch'
-        entity_id: sensor.time
         value_template: >-
           {% if states.sensor.nws_alerts.state | int > 0  %}
             {% if 'Thunderstorm Watch' in states.sensor.nws_alerts.attributes.title.split(' - ')[0] or
@@ -157,7 +153,6 @@ sensor:
           {% endif %}
       tornado_watch:
         friendly_name: 'Tornado Watch'
-        entity_id: sensor.time
         value_template: >-
           {% if states.sensor.nws_alerts.state | int > 0  %}
             {% if 'Tornado Watch' in states.sensor.nws_alerts.attributes.title.split(' - ')[0] or
@@ -174,7 +169,6 @@ sensor:
           {% endif %}
       tornado_warning:
         friendly_name: 'Tornado Warning'
-        entity_id: sensor.time
         value_template: >-
           {% if states.sensor.nws_alerts.state | int > 0  %}
             {% if 'Tornado Warning' in states.sensor.nws_alerts.attributes.title.split(' - ')[0] or
@@ -201,7 +195,6 @@ sensor:
       clothing_forecast:
         friendly_name: "Clothing Forecast"
         unit_of_measurement: ''
-        entity_id: sensor.nws_daytime_temperature
         value_template: >-
             {%- if states('sensor.nws_daytime_temperature')|float > 63 %}
               {%- if states('sensor.nws_daytime_temperature')|float < 80 %}
@@ -224,21 +217,17 @@ sensor:
             {%- endif %}
       nws_current_forecast:
         friendly_name: 'Current Forecast'
-        entity_id: weather.klzu_daynight
         value_template: "{{ states.weather.klzu_daynight.attributes.forecast[0].detailed_description | truncate(250, False) }}"
       nws_current_rain_forecast:
         friendly_name: 'Current Rain Chance'
-        entity_id: weather.klzu_daynight
         value_template: "{{ states.weather.klzu_daynight.attributes.forecast[0].precipitation_probability }}"
         unit_of_measurement: '%'
       nws_current_temperature:
         friendly_name: 'Current Temperature'
-        entity_id: weather.klzu_daynight
         value_template: "{{ states.weather.klzu_daynight.attributes.temperature }}"
         device_class: temperature
       nws_daytime_temperature:
         friendly_name: 'Daytime Temperature'
-        entity_id: weather.klzu_daynight
         value_template: >-
             {% if states.weather.klzu_daynight.attributes.forecast[0].daytime == True %}
               {{ states.weather.klzu_daynight.attributes.forecast[0].temperature }}
@@ -248,23 +237,18 @@ sensor:
         device_class: temperature
       nws_current_condition: 
         friendly_name: 'Current Condition'
-        entity_id: weather.klzu_daynight
         value_template: "{{ states.weather.klzu_daynight.state }}"
       nws_current_humidity:
         friendly_name: 'Current Humidity'
-        entity_id: weather.klzu_daynight
         value_template: "{{ states.weather.klzu_daynight.attributes.humidity }}"
       nws_current_visibility:
         friendly_name: "Current Visability"
-        entity_id: weather.klzu_daynight
         value_template: "{{ states.weather.klzu_daynight.attributes.visibility }}"
       nws_current_windspeed:
         friendly_name: "Current Windspeed"
-        entity_id: weather.klzu_daynight
         value_template: "{{ states.weather.klzu_daynight.attributes.wind_speed }}"
       nws_overnight_low:
         friendly_name: "Overnight Low"
-        entity_id: weather.klzu_daynight
         unit_of_measurement: ''
         value_template: >-
             {% if states.weather.klzu_daynight.attributes.forecast[0].daytime == False %}
@@ -274,7 +258,6 @@ sensor:
             {% endif %}
       nws_overnight_forecast:
         friendly_name: "Overnight Forecast"
-        entity_id: weather.klzu_daynight
         unit_of_measurement: ''
         value_template: >-
             {% if states.weather.klzu_daynight.attributes.forecast[0].daytime == False %}
@@ -286,7 +269,6 @@ sensor:
             {% endif %}
       nws_forecast_tomorrow:
         friendly_name: "Forecast Tomorrow"
-        entity_id: weather.klzu_daynight
         unit_of_measurement: ''
         value_template: >-
             {%- if states.weather.klzu_daynight.attributes.forecast[1].daytime == True %}
@@ -296,7 +278,6 @@ sensor:
             {%- endif %}
       nws_forecast_rain_tomorrow:
         friendly_name: "Rain Chance Tomorrow"
-        entity_id: weather.klzu_daynight
         unit_of_measurement: '%'
         value_template: >-
             {%- if states.weather.klzu_daynight.attributes.forecast[1].daytime == True %}
@@ -306,7 +287,6 @@ sensor:
             {%- endif %}
       nws_forecast_tomorrow_night:
         friendly_name: "Forecast Tomorrow Night"
-        entity_id: weather.klzu_daynight
         unit_of_measurement: ''
         value_template: >-
             {%- if states.weather.klzu_daynight.attributes.forecast[1].daytime == True %}
@@ -316,7 +296,6 @@ sensor:
             {%- endif %}
       nws_forecast_rain_tomorrow_night:
         friendly_name: "Rain Chance Tomorrow Night"
-        entity_id: weather.klzu_daynight
         unit_of_measurement: '%'
         value_template: >-
             {%- if states.weather.klzu_daynight.attributes.forecast[1].daytime == True %}
@@ -326,12 +305,10 @@ sensor:
             {%- endif %}
       current_inside_humidity:
         friendly_name: "Current Inside Humidity"
-        entity_id: climate.home
         unit_of_measurement: '%'
         value_template: "{{ states.climate.home.attributes.current_humidity }}"
       lighting_stike_count:
         friendly_name: "Lightning Strike Count"
-        entity_id: sensor.back_porch
         value_template: "{{ states.sensor.back_porch.attributes.strike_count }}"
 
 automation:
diff --git a/config/sensors/power.yaml b/config/sensors/power.yaml
index af00663..704a043 100755
--- a/config/sensors/power.yaml
+++ b/config/sensors/power.yaml
@@ -43,13 +43,11 @@
   sensors:
     # washer_power:
     #   friendly_name: "Washer Power"
-    #   entity_id: sensor.time
     #   unit_of_measurement: ''
     #   value_template: >-
     #       {{ states.switch.washer.attributes.current_power_w | int }}
     low_battery:
       friendly_name: 'Low Battery'
-      entity_id: sensor.time
       value_template: >
         {%- set threshold = 15 -%}
         {%- set domains = ['light', 'switch', 'sensor', 'zwave', 'lock', 'binary_sensor'] -%}