diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97ad2329..0b492f51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The **patch** part changes incrementally at each release.
 
 ### Changed
 * filebeat: install version 6.x by default
+* filebeat: cleanup unused code
 
 ### Fixed
 * evolinux-users: secondary groups are comma-separated
diff --git a/filebeat/defaults/main.yml b/filebeat/defaults/main.yml
index 9c40c5d9..75c8ae0f 100644
--- a/filebeat/defaults/main.yml
+++ b/filebeat/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
 elastic_stack_version: "6.x"
 
-filebeat_kibana_dashboards: False
 filebeat_logstash_plugin: False
diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml
index 89c0f7ab..eebbd8ee 100644
--- a/filebeat/tasks/main.yml
+++ b/filebeat/tasks/main.yml
@@ -40,10 +40,6 @@
     name: filebeat
     enabled: yes
 
-# - name: Kibana dashboards are imported
-#   command: /usr/share/filebeat/scripts/import_dashboards
-#   when: filebeat_kibana_dashboards
-
 - name: is logstash-plugin available?
   stat:
     path: /usr/share/logstash/bin/logstash-plugin