diff --git a/tasks/elasticsearch-config.yml b/tasks/elasticsearch-config.yml
index 7336041..8b16414 100644
--- a/tasks/elasticsearch-config.yml
+++ b/tasks/elasticsearch-config.yml
@@ -48,21 +48,14 @@
   - restart elasticsearch
 
 #Copy the logging.yml
-- name: Copy Logging.yml File for Instance
-  template: src=logging.yml.j2 dest={{conf_dir}}/logging.yml owner={{ es_user }} group={{ es_group }} mode=0644 force=yes
-  notify: restart elasticsearch
-  when: es_version | version_compare('5.0', '<')
 
 - name: Copy log4j2.properties File for Instance
   template: src=log4j2.properties.j2 dest={{conf_dir}}/log4j2.properties owner={{ es_user }} group={{ es_group }} mode=0644 force=yes
   notify: restart elasticsearch
-  when: es_version | version_compare('5.0', '>=')
 
-# Copy the JVM Options (5.x only)
 - name: Copy jvm.options File for Instance
   template: src=jvm.options.j2 dest={{conf_dir}}/jvm.options owner={{ es_user }} group={{ es_group }} mode=0644 force=yes
   notify: restart elasticsearch
-  when: es_version | version_compare('5.0', '>=')
 
 #Clean up un-wanted package scripts to avoid confusion
 
diff --git a/tasks/elasticsearch-parameters.yml b/tasks/elasticsearch-parameters.yml
index 73c5c55..b3f0146 100644
--- a/tasks/elasticsearch-parameters.yml
+++ b/tasks/elasticsearch-parameters.yml
@@ -28,6 +28,9 @@
 - set_fact: conf_dir={{ es_conf_dir }}/{{es_instance_name}}
 - set_fact: m_lock_enabled={{ (es_config['bootstrap.mlockall'] is defined and es_config['bootstrap.mlockall'] == True) or (es_config['bootstrap.memory_lock'] is defined and es_config['bootstrap.memory_lock'] == True) }}
 
+#TODO - if transport.host is not local maybe error on boostrap checks
+
+
 #Use systemd for the following distributions:
 #Ubuntu 15 and up
 #Debian 8 and up
diff --git a/tasks/main.yml b/tasks/main.yml
index e8395da..bcd2df0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,21 +17,26 @@
 - include: elasticsearch.yml
   tags:
       - install
+
 - include: elasticsearch-config.yml
   tags:
       - config
+
 - include: elasticsearch-scripts.yml
   when: es_scripts
   tags:
       - scripts
+
 - include: elasticsearch-plugins.yml
   when: es_plugins is defined or es_plugins_reinstall
   tags:
       - plugins
+
   #We always execute xpack as we may need to remove features
 - include: xpack/elasticsearch-xpack.yml
   tags:
       - xpack
+
 - include: elasticsearch-templates.yml
   when: es_templates
   tags: