diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml
index 956812ac7..0cb5193b5 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/kiwix_install.yml
@@ -58,9 +58,7 @@
     state: directory
 
 # 2. INSTALL KIWIX-TOOLS EXECUTABLES IF kiwix_force_install
-# (We get a whole web server for i686 but only kiwix execs for linux64 & armhf)
 
-#- name: Unarchive kiwix-tools .tar.gz or .tar.bz2 to /tmp
 - name: Unarchive kiwix-tools .tar.gz to /tmp
   unarchive:
     src: "{{ downloads_dir }}/{{ kiwix_src_file }}"
@@ -71,32 +69,7 @@
 
 - name: Move /tmp/{{ kiwix_src_dir }}/* to permanent location /opt/iiab/kiwix/bin (armhf & linux64 & i686)
   shell: "mv /tmp/{{ kiwix_src_dir }}/* {{ kiwix_path }}/bin/"
-#  when: kiwix_force_install and not kiwix_src_contains_bin
-
-#- name: Move /tmp/{{ kiwix_src_dir }}/bin/* to permanent location /opt/iiab/kiwix/bin (i686)
-#  shell: "mv /tmp/{{ kiwix_src_dir }}/bin/* {{ kiwix_path }}/bin/"
-#  when: kiwix_force_install and kiwix_src_contains_bin
-
-#- name: Unarchive Kiwix binaries to permanent location (NOT i686)
-#  unarchive:
-#    src: "{{ downloads_dir }}/{{ kiwix_src_file }}"
-#    dest: "{{ kiwix_path }}/bin"
-#    owner: root
-#    group: root
-#  when: kiwix_src_bin_only and kiwix_force_install
-
-#- name: Unarchive kiwix*i686.tar.bz2 to /tmp (i686)
-#  unarchive:
-#    src: "{{ downloads_dir }}/{{ kiwix_src_file }}"
-#    dest: /tmp
-#    # dest: "{{ iiab_base }}"
-#    owner: root
-#    group: root
-#  when: not kiwix_src_bin_only and kiwix_force_install
-#
-#- name: Move /tmp/kiwix*i686/bin/* to permanent location /opt/iiab/kiwix/bin (i686)
-#  shell: "mv /tmp/kiwix*i686/bin/* {{ kiwix_path }}/bin/"
-#  when: not kiwix_src_bin_only and kiwix_force_install
+  when: kiwix_force_install
 
 # 3. ENABLE MODS FOR APACHE PROXY IF DEBUNTU
 
@@ -194,8 +167,5 @@
     value: "{{ iiab_zim_path }}"
   - option: kiwix_library_xml
     value: "{{ kiwix_library_xml }}"
-# The following 2 lines are unused: (Nov 2017)
-#   - option: kiwix_content_path
-#     value: "{{ kiwix_content_path }}"
   - option: enabled
     value: "{{ kiwix_enabled }}"