diff --git a/roles/OpenVPN-Server/meta/main.yml b/roles/OpenVPN-Server/meta/main.yml
index b5248e14fe2b08c9c6a1f4997c21d42c83cc305d..46f5a2316b48320534f9e99db594e1bb61d34744 100644
--- a/roles/OpenVPN-Server/meta/main.yml
+++ b/roles/OpenVPN-Server/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
-  - { role: easy-rsa-CA }
   - { role: easy-rsa-certificate, x509_csr_args: "--server" }
diff --git a/roles/easy-rsa-certificate/tasks/buildCert.yml b/roles/easy-rsa-certificate/tasks/buildCert.yml
index c5299982e182f3d749e5e9a6a3ad47c2c9442280..db53d46959498b95e5a2a85478c950e97cc6085e 100644
--- a/roles/easy-rsa-certificate/tasks/buildCert.yml
+++ b/roles/easy-rsa-certificate/tasks/buildCert.yml
@@ -47,8 +47,6 @@
 
 - name: "Creating CSR"
   shell: " cd /etc/easy-rsa/2.0; . ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA\"/pkitool --csr {{ x509_csr_args }} {{ x509_common_name }}"
-#  args:
-#    creates: "/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.key"
   when: needcert
   sudo: true
 
@@ -64,23 +62,14 @@
 - name: "Copy CSR to CA"
   remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
   delegate_to: "{{ x509_ca_server }}"
-#  copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.csr dest=/tmp/{{ inventory_hostname }}.csr force=yes"
   copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.csr dest=/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.csr force=yes"
   when: needcert
   sudo: true
 
-#- name: "Place CSR to a right place"
-#  local_action: "command cp -f /tmp/{{ inventory_hostname }}.csr /etc/easy-rsa/2.0/keys/{{ x509_common_name }}.csr"
-#  when: needcert
-#  sudo: true
-
 - name: "Sign Certificate"
   remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
   delegate_to: "{{ x509_ca_server }}"
   shell:    "cd /etc/easy-rsa/2.0; . ./vars; export EASY_RSA=\"${EASY_RSA:-.}\" ;\"$EASY_RSA\"/pkitool --sign {{ x509_sign_args }} {{ x509_common_name }}"
-#  args:
-#    chdir: "/etc/easy-rsa/2.0"
-#    creates: "/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.crt"
   when: needcert
   sudo: true
 
@@ -103,7 +92,6 @@
   sudo: true
 
 - name: "Copy the certificate to the node"
-#  copy: "src=/tmp/{{ x509_common_name }}.crt dest={{ x509_cert_file }} force=yes"
   copy: "src=/tmp/{{ inventory_hostname }}/{{ x509_common_name }}.crt dest=/tmp/{{ x509_common_name }}.crt force=yes"
   sudo: true
   when: needcert
diff --git a/roles/etcHosts/defaults/main.yml b/roles/etcHosts/defaults/main.yml
deleted file mode 100644
index 1ee9792b74245b835aa02f97d1c4fa669b886387..0000000000000000000000000000000000000000
--- a/roles/etcHosts/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-get_groups: true
-edit_hosts: true
diff --git a/roles/etcHosts/tasks/main.yml b/roles/etcHosts/tasks/main.yml
index 1486d481a3a4c8b048444742b784ccb65d2c1e5a..f527a58950bcd0543c321856255738f734096518 100644
--- a/roles/etcHosts/tasks/main.yml
+++ b/roles/etcHosts/tasks/main.yml
@@ -2,14 +2,12 @@
   template: dest=/tmp/groups src=groups.j2
   run_once: True
   delegate_to: 127.0.0.1
-  when: get_groups
 
 - name: make hosts data
   command: ./scripts/makehosts.py /tmp/groups {{ domain }}
   delegate_to: 127.0.0.1
   run_once: True
   register: hosts_data
-  when: edit_hosts
                
 - name: write hosts file
   lineinfile:
@@ -19,4 +17,3 @@
     state: present
   sudo: true
   with_items: hosts_data.stdout_lines
-  when: edit_hosts
diff --git a/roles/slurm-build/tasks/main.yml b/roles/slurm-build/tasks/main.yml
index 86a3d6d59968e0a386c2eeb0e2a73585cf321e1f..4d91dcc69f41f44faf4b3fb78048c65311258c60 100644
--- a/roles/slurm-build/tasks/main.yml
+++ b/roles/slurm-build/tasks/main.yml
@@ -39,7 +39,6 @@
   shell: rpm -i /root/rpmbuild/RPMS/x86_64/munge-libs-{{ munge_version }}-1.el6.x86_64.rpm /root/rpmbuild/RPMS/x86_64/munge-{{ munge_version }}-1.el6.x86_64.rpm /root/rpmbuild/RPMS/x86_64/munge-devel-{{ munge_version }}-1.el6.x86_64.rpm
   sudo: true
   when: munge_installed.stdout.find("munge") == -1 
-#  when: munge_installed is failed or munge_installed.stdout.find("munge") == -1 
 
 - name: make slurm rpms
   shell: rpmbuild -ta --clean slurm-{{ slurm_version }}.tar.bz2
diff --git a/roles/syncExports/templates/exports.j2 b/roles/syncExports/templates/exports.j2
index ca23e5727957ff8fdea2677ae04f8eb7340a25ce..21c4f552610f7c382d3159c85cc6788786c8df85 100644
--- a/roles/syncExports/templates/exports.j2
+++ b/roles/syncExports/templates/exports.j2
@@ -1,6 +1,13 @@
+{% set iplist = [] %}
 {% for export in exportList %}
-{{ export.src }} {% for group in groupList %}{% for node in groups[group.name] %} {{ hostvars[node]['ansible_'+group.interface]['ipv4']['address'] }}({{ export.srvopts }}) 
-{% endfor %}
+{% for group in groupList %}
+{% for node in groups[group.name] %}
+{% if hostvars[node]['ansible_'+group.interface] is defined %}
+{% if iplist.append(hostvars[node]['ansible_'+group.interface]['ipv4']['address']) %}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endfor %}
+{{ export.src }} {% for ip in iplist|unique %}{{ ip }}({{ export.srvopts }}) {% endfor %}
 
+{% endfor %}