diff --git a/.HA_VERSION b/.HA_VERSION
index 8341424d1516ddb5017396224753851165778dde..08de1c6af805c621ee1f9237bc211894f0cda131 100644
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.65.3
\ No newline at end of file
+0.88.1
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..031a39fe656d4fa1463ea3aa492b601588353f05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+deps
+*.db
+.storage/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7367bc9a94f735145a51c9b3653cf75b129b1443
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,15 @@
+stages:
+  - test
+
+lint:
+  stage: test
+  image: homeassistant/amd64-homeassistant
+  before_script:
+    - mkdir -p /home/pi/ssl
+    - mkdir -p /home/pi/.ssh
+    - touch /home/pi/ssl/chain
+    - touch /home/pi/ssl/key
+    - touch /home/pi/.ssh/id_rsa
+  script:
+    - hass --version
+    - hass --script check_config -c .
diff --git a/README.md b/README.md
index c57a1b240b344d70f4aefba2d09934c932f0cf22..96487d4e2896266e4f772034621cfe5fcbc89a1b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# [Home Assistant](https://home-assistant.io/) Configurations
+# [Home Assistant](https://home-assistant.io/) Configurations [![pipeline status](https://git.ethitter.com/open-source/Home-Assistant-Config/badges/master/pipeline.svg)](https://git.ethitter.com/open-source/Home-Assistant-Config/commits/master)
 
 My configuration files for the open-source [Home Assistant](https://home-assistant.io/) home-automation platform. Provided as a reference, with no warranty or other support. Released under GPL 2.
 
diff --git a/asuswrt.yaml b/asuswrt.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..30bf48445354b1d1c9ffaca7644200db19aa22dc
--- /dev/null
+++ b/asuswrt.yaml
@@ -0,0 +1,3 @@
+host: 192.168.1.1
+username: !secret asus_user
+ssh_key: !secret asus_key
diff --git a/automations/apc-notification-not-online.yaml b/automations/apc-notification-not-online.yaml
index 937849904d6bfffd3b7f33f5e3470821fdc0889a..62b0f7c21d33b2e75642cf0d399af03c6fb59cc9 100644
--- a/automations/apc-notification-not-online.yaml
+++ b/automations/apc-notification-not-online.yaml
@@ -4,10 +4,6 @@ trigger:
   entity_id: sensor.ups_status
   from: "ONLINE"
 action:
-  - service: notify.jabber
-    data:
-      message: "Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
-      target: !secret jabber_recipient
   - service: notify.mattermost
     data:
       message: ":exclamation: :battery: Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
diff --git a/automations/apc-notification-online.yaml b/automations/apc-notification-online.yaml
index ea78dfd76ee37b8e720c0e641298d498f8aaace0..1bf6ebc4373febdd87190fa77db38ac2a2f42ec6 100644
--- a/automations/apc-notification-online.yaml
+++ b/automations/apc-notification-online.yaml
@@ -4,10 +4,6 @@ trigger:
   entity_id: sensor.ups_status
   to: "ONLINE"
 action:
-  - service: notify.jabber
-    data:
-      message: 'Office APC is "ONLINE"'
-      target: !secret jabber_recipient
   - service: notify.mattermost
     data:
       message: ':exclamation: :electric_plug: Office APC is "ONLINE"'
diff --git a/automations/maybe-an-earthquake.yaml b/automations/maybe-an-earthquake.yaml
index 0f07cf940825b62dfff473f812bf132eaacb2260..79fe7109fcf2698531b13244b20d2cee0c4c3bb0 100644
--- a/automations/maybe-an-earthquake.yaml
+++ b/automations/maybe-an-earthquake.yaml
@@ -31,10 +31,6 @@ action:
       - scene.master_bedroom_bright
       - scene.master_bath_bright
       - scene.balcony_bright
-  - service: notify.jabber
-    data:
-      message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
-      target: !secret jabber_recipient
   - service: notify.mattermost
     data:
       message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
diff --git a/binary-sensors/vps-digital-ocean.yaml b/binary-sensors/vps-digital-ocean.yaml
deleted file mode 100644
index b18c0125896671ac8c3144d9399f10e229b643d1..0000000000000000000000000000000000000000
--- a/binary-sensors/vps-digital-ocean.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: digital_ocean
-droplets:
-  - ''
-  - ''
diff --git a/binary-sensors/vps-linode.yaml b/binary-sensors/vps-linode.yaml
deleted file mode 100644
index 5ce7c6239b3e76942a7d35760c00997da9bc01fe..0000000000000000000000000000000000000000
--- a/binary-sensors/vps-linode.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-platform: linode
-nodes:
-  - ''
diff --git a/binary-sensors/vps-vultr-lax.yaml b/binary-sensors/vps-vultr-lax.yaml
deleted file mode 100644
index 2373c319a8aad20a3822e0a835665daf0a20c97e..0000000000000000000000000000000000000000
--- a/binary-sensors/vps-vultr-lax.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-platform: vultr
-subscription: 
diff --git a/binary-sensors/vps-vultr-ldj.yaml b/binary-sensors/vps-vultr-ldj.yaml
deleted file mode 100644
index 2373c319a8aad20a3822e0a835665daf0a20c97e..0000000000000000000000000000000000000000
--- a/binary-sensors/vps-vultr-ldj.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-platform: vultr
-subscription: 
diff --git a/configuration.yaml b/configuration.yaml
index 768bdb1d8e3acf74571de306a3f8c90b2cd0f8a4..78d4a04a9d24edd931638a8ba2534010269a5971 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -8,10 +8,14 @@ homeassistant:
   elevation: 250
   # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   time_zone: America/Los_Angeles
-  #
   unit_system: imperial
-  #
   customize: !include_dir_merge_named customizations
+  auth_providers:
+   - type: homeassistant
+   - type: legacy_api_password
+   - type: trusted_networks
+
+auth:
 
 http:
   api_password: !secret api_password
@@ -43,7 +47,7 @@ frontend:
 # Set recorder options
 recorder:
   purge_interval: 1
-  purge_keep_days: 90
+  purge_keep_days: 30
   db_url: !secret mysql_recorder
 
 # Enables support for tracking state changes over time.
@@ -58,10 +62,6 @@ discovery:
 # Logging settings
 logger:
   default: warn # default logging level
-  logs:
-    homeassistant.components.device_tracker.asuswrt: error # suppress IPv6-related warnings; see https://github.com/home-assistant/home-assistant/issues/2814
-    homeassistant.components.sensor.rest: debug # to aid debugging locks
-    homeassistant.helpers.entity: fatal # Hue bridge throws lots of errors
 
 # View all events in a logbook
 logbook:
@@ -77,10 +77,12 @@ mqtt:
   broker: localhost
 
 # Components
+asuswrt: !include asuswrt.yaml
+
 hue:
   bridges: !include hue.yaml
 
-media_player: !include media-player.yaml
+cast:
 
 switch: !include switches.yaml
 
@@ -94,8 +96,6 @@ alarm_control_panel: !include alarm-control-panel.yaml
 
 wemo: !include wemo.yaml
 
-weblink: !include weblinks.yaml
-
 panel_iframe: !include panels-iframe.yaml
 
 apcupsd:
@@ -110,21 +110,9 @@ scene: !include_dir_list scenes
 
 script: !include scripts.yaml
 
-shell_command: !include shell_commands.yaml
-
 automation: !include_dir_list automations
 
 # Controls
 input_select: !include input-selects.yaml
 
 input_number: !include input-numbers.yaml
-
-# VPS hosts
-linode:
-  access_token: !secret linode1
-
-digital_ocean:
-  access_token: !secret digital_ocean
-
-vultr:
-  api_key: !secret vultr
diff --git a/customizations/scripts.yaml b/customizations/scripts.yaml
deleted file mode 100644
index 6e081d05a413a658e79e78ca4365bad0ef3d6888..0000000000000000000000000000000000000000
--- a/customizations/scripts.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-script.restart_august_daemon:
-  friendly_name: Restart August daemon
-  icon: mdi:autorenew
-script.force_lock_interior:
-  friendly_name: Lock Interior
-  icon: mdi:autorenew
-script.force_unlock_interior:
-  friendly_name: Unlock Interior
-  icon: mdi:autorenew
-script.force_disconnect_interior:
-  friendly_name: Disconnect Interior
-  icon: mdi:close-octagon
-script.force_lock_keyed:
-  friendly_name: Lock Keyed
-  icon: mdi:autorenew
-script.force_unlock_keyed:
-  friendly_name: Unlock Keyed
-  icon: mdi:autorenew
-script.force_disconnect_keyed:
-  friendly_name: Disconnect Keyed
-  icon: mdi:close-octagon
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index 16b23f60939fb328577d3dc7c56d4e23420b42c8..325e190df22f0a840eed042a20eb26e1ece72dc2 100644
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -1,9 +1,3 @@
-sensor.speedtest_ping:
-  icon: mdi:radar
-sensor.speedtest_download:
-  icon: mdi:download
-sensor.speedtest_upload:
-  icon: mdi:upload
 sensor.kitchen_fluorescent_consumption:
   friendly_name: Kitchen Fluorescent
   icon: mdi:lightbulb-outline
@@ -52,72 +46,6 @@ sensor.office_cabinet_battery_level:
 sensor.green_keys_battery_level:
   friendly_name: Green keys
   icon: mdi:battery-outline
-sensor.pws_weather:
-  friendly_name: Weather
-sensor.pws_temp_f:
-  friendly_name: Temperature
-sensor.pws_feelslike_string:
-  friendly_name: Feels Like
-  icon: mdi:thermometer
-sensor.pws_heat_index_string:
-  friendly_name: Heat Index
-  icon: mdi:thermometer
-sensor.pws_relative_humidity:
-  friendly_name: Humidity
-  icon: mdi:weather-rainy
-sensor.pws_dewpoint_string:
-  friendly_name: Dewpoint
-  icon: mdi:weather-rainy
-sensor.pws_wind_string:
-  friendly_name: Wind
-  icon: mdi:weather-windy
-sensor.pws_precip_today_string:
-  friendly_name: Precipitation
-  icon: mdi:weather-rainy
-sensor.pws_pressure_in:
-  friendly_name: Pressure
-  icon: mdi:thermometer-lines
-sensor.pws_visibility_mi:
-  friendly_name: Visibility
-sensor.pws_uv:
-  friendly_name: UV
-  icon: mdi:weather-sunny
-sensor.pws_solarradiation:
-  friendly_name: Solar Radiation
-  icon: mdi:weather-sunny
-sensor.pws_dewpoint_c:
-  friendly_name: Dew Point (C)
-sensor.pws_dewpoint_f:
-  friendly_name: Dew Point (F)
-sensor.pws_feelslike_c:
-  friendly_name: Feels Like (C)
-sensor.pws_feelslike_f:
-  friendly_name: Feels Like (F)
-sensor.pws_heat_index_c:
-  friendly_name: Heat Index (C)
-sensor.pws_heat_index_f:
-  friendly_name: Heat Index (F)
-sensor.pws_precip_today_in:
-  friendly_name: Precipitation (in)
-sensor.pws_precip_today_metric:
-  friendly_name: Precipitation (mm)
-sensor.pws_pressure_mb:
-  friendly_name: Pressure (mb)
-sensor.pws_station_id:
-  friendly_name: Weather Station ID
-sensor.pws_temp_c:
-  friendly_name: Temperature (C)
-sensor.pws_visibility_km:
-  friendly_name: Visibility
-sensor.pws_wind_dir:
-  friendly_name: Wind Direction
-sensor.pws_wind_kph:
-  friendly_name: Wind Speed (kph)
-sensor.pws_wind_mph:
-  friendly_name: Wind Speed (mph)
-sensor.pws_alerts:
-  friendly_name: Severe Weather
-  icon: mdi:alert-outline
 sensor.time:
   friendly_name: Time (PT)
 sensor.ups_status:
diff --git a/device-tracker.yaml b/device-tracker.yaml
index 896499d0ab0d0d30907cf0dcc5a5e3a7b65002ad..c99a62c731a4b1e309a18747fb3dc892033236dd 100644
--- a/device-tracker.yaml
+++ b/device-tracker.yaml
@@ -2,10 +2,3 @@
   qos: 1
   devices:
     green_keys: smartthings/Green Keys/presence
-- platform: asuswrt
-  host: 192.168.1.1
-  username: !secret asus_user
-  ssh_key: !secret asus_key
-  consider_home: 90
-  new_device_defaults:
-    track_new_devices: false
diff --git a/entity_registry.yaml b/entity_registry.yaml
deleted file mode 100644
index fecaaf73f3c5157c1f8a36c82ed03522e63a29ae..0000000000000000000000000000000000000000
--- a/entity_registry.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-light.ericks_desk_lamp:
-  platform: hue
-  unique_id: 00:17:88:01:10:28:1d:5c-0b
-light.master_bath_1:
-  platform: hue
-  unique_id: 00:17:88:01:10:26:ea:c1-0b
-light.master_bath_2:
-  platform: hue
-  unique_id: 00:17:88:01:10:26:e0:cf-0b
-light.nightstand:
-  platform: hue
-  unique_id: 00:17:88:01:10:26:c4:ec-0b
-light.ceiling_fan_1:
-  platform: hue
-  unique_id: 00:17:88:01:10:28:05:62-0b
-light.office:
-  platform: hue
-  unique_id: 00:17:88:01:10:26:c8:f8-0b
-light.corner_table:
-  platform: hue
-  unique_id: 00:17:88:01:10:26:f1:99-0b
-light.ceiling_fan_2:
-  platform: hue
-  unique_id: 00:17:88:01:10:28:1e:05-0b
-light.master_bath_3:
-  platform: hue
-  unique_id: 00:17:88:01:10:28:5d:db-0b
-light.balcony_2:
-  platform: hue
-  unique_id: 00:17:88:01:10:28:58:54-0b
-light.endtable:
-  platform: hue
-  unique_id: 00:17:88:01:10:26:be:26-0b
-switch.kitchen_nightlight:
-  platform: wemo
-  unique_id: 231624K12008CB
-media_player.nexus_player:
-  platform: cast
-  unique_id: 3ab2baa0-f44b-431c-2101-9ea71c44c871
-media_player.living_room:
-  platform: cast
-  unique_id: 85609ba9-d576-0aef-b97b-2f00c7a28979
-media_player.apartment:
-  platform: cast
-  unique_id: 70741ea6-7b39-44e9-ae21-14d85ebf8686
-media_player.common_area:
-  platform: cast
-  unique_id: 95937ccb-b60f-429e-8773-6513038c6535
-media_player.kitchen:
-  platform: cast
-  unique_id: eac89627-50fe-bcfa-1498-ec83c7a4ed62
-media_player.office:
-  platform: cast
-  unique_id: 541ec58c-063e-2dfb-59c2-1b9a867616c2
diff --git a/google-assistant.yaml b/google-assistant.yaml
index 09f541b6bc1af10348946bbaf725d38e8abedeac..4e730719922c37b57257b2a94b0f3276257d8afb 100644
--- a/google-assistant.yaml
+++ b/google-assistant.yaml
@@ -1,6 +1,4 @@
 project_id: !secret google_home_project_id
-client_id: !secret google_home_client_id
-access_token: !secret google_home_access_token
 api_key: !secret google_home_api_key
 exposed_domains:
   - switch
diff --git a/groups.yaml b/groups.yaml
index 4f612e528c0316484d0d82f439d2e07b6503100f..ad2bc2c1e11403827d45810c01b711e84ce3a040 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -3,7 +3,6 @@ default_view:
   view: yes
   icon: mdi:home
   entities:
-    - group.locks
     - group.master_bedroom
     - group.master_bathroom
     - group.living_room
@@ -23,10 +22,6 @@ sensor_view:
     - group.smoke_gas
     - group.power_consumption
     - group.presence
-    - sensor.speedtest_ping
-    - sensor.speedtest_download
-    - sensor.speedtest_upload
-    - sensor.fastcom_download
     - sun.sun
 status_view:
   name: Status
@@ -36,29 +31,20 @@ status_view:
     - group.time_date
     - group.sensor_pi
     - group.sensor_apc
-    - group.vps
-weather_view:
-  name: Weather
+media_view:
+  name: Media
   view: yes
-  icon: mdi:white-balance-sunny
+  icon: mdi:play-network
   entities:
-    - group.wunderground
+    - media_player.living_room
 misc_view:
   name: Misc
   view: yes
   icon: mdi:power
   entities:
-    - group.scripts_misc
     - group.misc_misc
     - group.haveibeenpwned
     - group.sensor_battery_levels
-locks:
-  name: Locks
-  entities:
-    - switch.august_interior
-    - switch.august_keyed
-    - script.force_unlock_interior
-    - script.force_unlock_keyed
 master_bedroom:
   name: Master Bedroom
   entities:
@@ -177,7 +163,7 @@ sensor_pi:
   name: Raspberry Pi
   entities:
     - sensor.cpu_use
-    - sensor.disk_use_
+    - sensor.disk_use
     - sensor.disk_use_varlog
     - sensor.ram_use
     - sensor.ram_free
@@ -203,21 +189,6 @@ sensor_apc:
     - sensor.ups_nominal_input_voltage
     - sensor.ups_nominal_output_power
     - sensor.ups_load_mean
-vps:
-  name: VPS
-  entities:
-    - binary_sensor.example
-scripts_misc:
-  name: Lock Actions
-  control: hidden
-  entities:
-    - script.restart_august_daemon
-    - script.force_lock_interior
-    - script.force_unlock_interior
-    - script.force_disconnect_interior
-    - script.force_lock_keyed
-    - script.force_unlock_keyed
-    - script.force_disconnect_keyed
 misc_misc:
   name: Other
   control: hidden
@@ -245,20 +216,3 @@ sensor_battery_levels:
     - sensor.office_motion_sensor_far_wall_battery_level
     - sensor.office_cabinet_battery_level
     - sensor.green_keys_battery_level
-wunderground:
-  name: Wunderground
-  entities:
-    - sensor.pws_weather
-    - sensor.pws_temp_f
-    - sensor.pws_feelslike_string
-    - sensor.pws_heat_index_string
-    - sensor.pws_relative_humidity
-    - sensor.pws_dewpoint_string
-    - sensor.pws_wind_string
-    - sensor.pws_precip_today_string
-    - sensor.pws_pressure_in
-    - sensor.pws_visibility_mi
-    - sensor.pws_uv
-    - sensor.pws_solarradiation
-    - sensor.pws_alerts
-    - weblink.forecast
diff --git a/media-player.yaml b/media-player.yaml
deleted file mode 100644
index 832addd7055941c67389399939df5fcc00fe6bb9..0000000000000000000000000000000000000000
--- a/media-player.yaml
+++ /dev/null
@@ -1 +0,0 @@
-- platform: cast
diff --git a/notifications.yaml b/notifications.yaml
index 88053d8e75df3917b020daac000b1ded1d7453bd..a064412bc626dcfda23f14dcaf3f0ccf64b644a9 100644
--- a/notifications.yaml
+++ b/notifications.yaml
@@ -1,9 +1,3 @@
-- name: jabber
-  platform: xmpp
-  sender: !secret jabber_sender
-  password: !secret jabber_password
-  recipient: !secret jabber_recipient
-  tls: true
 - name: mattermost
   platform: rest
   resource: !secret mattermost_webhook
diff --git a/secrets.yaml b/secrets.yaml
index 48a99eb21b4964fbd1445377685c591f01b8c523..1db37fc32db82e8cf6f0c89bf97ef5e8c11f52ec 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -1,31 +1,19 @@
-host_ip:
-api_password:
-latitude:
-longitude:
-jabber_sender:
-jabber_recipient:
-jabber_password:
-asus_user:
-asus_key:
-gravatar_erick:
-gravatar_chris:
-gravatar_chris_2:
-wunderground_key:
-wunderground_pws_id:
-wunderground_forecast_url:
-logentries_token:
-mysql_recorder:
-wemo_kitchen_ip:
-pi_hole_host:
-pi_hole_backup_host:
-pi_hole_admin:
-monit_admin:
-mattermost_webhook:
-linode1:
-linode2:
-digital_ocean:
-vultr:
-google_home_project_id:
-google_home_client_id:
-google_home_access_token:
-google_home_api_key:
+host_ip: 127.0.0.1
+api_password: password
+latitude: 0
+longitude: 0
+asus_user: asus
+asus_key: /home/pi/.ssh/id_rsa
+gravatar_erick: something@example.com
+gravatar_chris: something@example.com
+gravatar_chris_2: something@example.com
+logentries_token: abcdef0123456789
+mysql_recorder: mysql://hadb:password@127.0.0.1/hass
+wemo_kitchen_ip: 127.0.0.1
+pi_hole_host: 127.0.0.1
+pi_hole_backup_host: 127.0.0.1
+pi_hole_admin: 127.0.0.1
+monit_admin: 'https://127.0.0.1:2812/'
+mattermost_webhook: http://127.0.0.1
+google_home_project_id: 1
+google_home_api_key: abcdef0123456789
diff --git a/sensors/apcupsd.yaml b/sensors/apcupsd.yaml
index dc92c1a3be5eba1241a34325d2c9f86bfd971af1..7566d941564783a759094fbf4ff476ac60c338ad 100644
--- a/sensors/apcupsd.yaml
+++ b/sensors/apcupsd.yaml
@@ -13,7 +13,6 @@ resources:
   - tonbatt
   - lastxfer
   - cumonbatt
-  - xonbatt
   - xoffbatt
   - model
   - serialno
diff --git a/sensors/fastcom.yaml b/sensors/fastcom.yaml
deleted file mode 100644
index 8ee5e2c0b05b2c98bcb7404e43a0303a6958f70a..0000000000000000000000000000000000000000
--- a/sensors/fastcom.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-platform: fastdotcom
-minute:
-  - 4
-  - 19
-  - 34
-  - 49
diff --git a/sensors/speedtest.yaml b/sensors/speedtest.yaml
deleted file mode 100644
index ad399eb86d2d7cbf99cf2c8c1b84fd63e19a183a..0000000000000000000000000000000000000000
--- a/sensors/speedtest.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-platform: speedtest
-minute:
-  - 2
-  - 17
-  - 32
-  - 47
-monitored_conditions:
-- ping
-- download
-- upload
diff --git a/sensors/systemmonitor.yaml b/sensors/systemmonitor.yaml
index 9c449fd42893651616183a9c30de04625c32e399..7e708990d994f100614a7b769c3be2222f413273 100644
--- a/sensors/systemmonitor.yaml
+++ b/sensors/systemmonitor.yaml
@@ -12,7 +12,6 @@ resources:
   - type: swap_use
   - type: swap_free
   - type: last_boot
-  - type: since_last_boot
   - type: network_in
     arg: eth0
   - type: network_out
diff --git a/sensors/wunderground.yaml b/sensors/wunderground.yaml
deleted file mode 100644
index 9a598827a732d3f9e4b616d953af9b9250b14216..0000000000000000000000000000000000000000
--- a/sensors/wunderground.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-platform: wunderground
-api_key: !secret wunderground_key
-pws_id: !secret wunderground_pws_id
-monitored_conditions:
-  - weather
-  - temp_f
-  - temp_c
-  - station_id
-  - feelslike_c
-  - feelslike_f
-  - feelslike_string
-  - heat_index_c
-  - heat_index_f
-  - heat_index_string
-  - dewpoint_c
-  - dewpoint_f
-  - dewpoint_string
-  - wind_kph
-  - wind_mph
-  - UV
-  - pressure_in
-  - pressure_mb
-  - wind_dir
-  - wind_string
-  - relative_humidity
-  - visibility_mi
-  - visibility_km
-  - precip_today_in
-  - precip_today_metric
-  - precip_today_string
-  - solarradiation
-  - alerts
diff --git a/shell_commands.yaml b/shell_commands.yaml
deleted file mode 100644
index 8e9b630790e1fa7a2d20199f51b028d6e42c5f1d..0000000000000000000000000000000000000000
--- a/shell_commands.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-restart_august_daemon: /usr/bin/pm2 restart augustctl
-force_lock_keyed: curl http://localhost:3000/api/lock/keyed
-force_lock_interior: curl http://localhost:3000/api/lock/interior
-force_unlock_keyed: curl http://localhost:3000/api/unlock/keyed
-force_unlock_interior: curl http://localhost:3000/api/unlock/interior
-force_disconnect_keyed: curl http://localhost:3000/api/disconnect/keyed
-force_disconnect_interior: curl http://localhost:3000/api/disconnect/interior
diff --git a/switches.yaml b/switches.yaml
index 0519235cb8a82a0b16d21d4d4cf52a10d5d7854d..f663c23bd9480e4b99a8423b6e921db35df13617 100644
--- a/switches.yaml
+++ b/switches.yaml
@@ -40,17 +40,3 @@
   payload_on: "on"
   payload_off: "off"
   retain: true
-- platform: command_line
-  switches:
-    august_interior:
-      command_on: 'curl "http://localhost:3000/api/lock/interior"'
-      command_off: 'curl "http://localhost:3000/api/unlock/interior"'
-      command_state: 'curl --silent "http://localhost:3000/api/status/interior" | jq ".status"'
-      value_template: '{{ value == "0" }}'
-- platform: command_line
-  switches:
-    august_keyed:
-      command_on: 'curl "http://localhost:3000/api/lock/keyed"'
-      command_off: 'curl "http://localhost:3000/api/unlock/keyed"'
-      command_state: 'curl --silent "http://localhost:3000/api/status/keyed" | jq ".status"'
-      value_template: '{{ value == "0" }}'
diff --git a/weblinks.yaml b/weblinks.yaml
deleted file mode 100644
index 99870e2f7742d68591aa118013e288dcdfba8cf8..0000000000000000000000000000000000000000
--- a/weblinks.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-entities:
-  - name: Forecast
-    url: !secret wunderground_forecast_url
-    icon: mdi:web