Remove some previous hotfix code

salt/elasticsearch/init.sls

@@ -132,12 +132,9 @@ esrolesdir:
     - makedirs: True
 
 eslibdir:
-  file.directory:
+  file.absent:
     - name: /opt/so/conf/elasticsearch/lib
-    - user: 930
-    - group: 939
-    - makedirs: True
-
+   
 esingestdynamicconf:
   file.recurse:
     - name: /opt/so/conf/elasticsearch/ingest
@@ -186,14 +183,6 @@ es_template_{{TEMPLATE.split('.')[0] | replace("/","_") }}:
     - group: 939
 {% endfor %}
 
-eslibsync:
-  file.managed:
-    - name: /opt/so/conf/elasticsearch/lib/log4j-core-2.11.1-patched.jar
-    - source: salt://elasticsearch/lib/log4j-core-2.11.1-patched.jar
-    - user: 930
-    - group: 939
-    - mode: 644
-
 esroles:
   file.recurse:
     - source: salt://elasticsearch/roles/
@@ -282,7 +271,6 @@ so-elasticsearch:
       - 0.0.0.0:9200:9200
       - 0.0.0.0:9300:9300
     - binds:
-      - /opt/so/conf/elasticsearch/lib/log4j-core-2.11.1-patched.jar:/usr/share/elasticsearch/lib/log4j-core-2.11.1.jar:ro
       - /opt/so/conf/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
       - /opt/so/conf/elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro
       - /nsm/elasticsearch:/usr/share/elasticsearch/data:rw

salt/logstash/init.sls

@@ -62,11 +62,8 @@ logstash:
     - home: /opt/so/conf/logstash
 
 lslibdir:
-  file.directory:
+  file.absent:
     - name: /opt/so/conf/logstash/lib
-    - user: 931
-    - group: 939
-    - makedirs: True
 
 lsetcdir:
   file.directory:
@@ -130,14 +127,6 @@ lsetcsync:
     - clean: True
     - exclude_pat: pipelines*
 
-lslibsync:
-  file.managed:
-    - name: /opt/so/conf/logstash/lib/log4j-core-2.14.0-patched.jar
-    - source: salt://logstash/lib/log4j-core-2.14.0-patched.jar
-    - user: 931
-    - group: 939
-    - mode: 644
-
 # Create the import directory
 importdir:
   file.directory:
@@ -177,7 +166,6 @@ so-logstash:
       - {{ BINDING }}
   {% endfor %}
     - binds:
-      - /opt/so/conf/logstash/lib/log4j-core-2.14.0-patched.jar:/usr/share/logstash/logstash-core/lib/jars/log4j-core-2.14.0.jar:ro
       - /opt/so/conf/elasticsearch/templates/:/templates/:ro
       - /opt/so/conf/logstash/etc/:/usr/share/logstash/config/:ro
       - /opt/so/conf/logstash/pipelines:/usr/share/logstash/pipelines:ro