diff --git a/configuration.yaml b/configuration.yaml
index 42d64c2..8ecd97a 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -10,21 +10,17 @@ homeassistant:
   # Everything important is here
   packages: !include_dir_named packages
 
+default_config:
 discovery:
 frontend:
   themes: !include_dir_merge_named themes
 recorder:
   db_url: mysql://hass:hass@db:3306/hass?charset=utf8
-history:
-logbook:
-config:
 logger:
   default: info
   logs:
     homeassistant.components.http.view: warn
 
-system_health:
-
 http:
   # mydomain.com:443 - proxied by nginx to port 8123
   base_url: !secret base_url
diff --git a/packages/environment.yaml b/packages/environment.yaml
index b57bd36..60e938d 100644
--- a/packages/environment.yaml
+++ b/packages/environment.yaml
@@ -20,5 +20,3 @@ sensor:
     headers:
       Accept: application/json
     value_template: '{{ value_json.week | int }}'
-
-sun: