diff --git a/roles/network/tasks/ifcfg_mods.yml b/roles/network/tasks/ifcfg_mods.yml
index b985aa401..760cdd4aa 100644
--- a/roles/network/tasks/ifcfg_mods.yml
+++ b/roles/network/tasks/ifcfg_mods.yml
@@ -14,13 +14,13 @@
 # clear all bridge ifcfg files
 - name: Now delete slave bridge ifcfg files
   shell: rm -f /etc/sysconfig/network-scripts/ifcfg-"{{ item }}"
-  when: num_lan_interfaces != "0" or iiab_wireless_lan_iface != "none"
+  when: num_lan_interfaces != 0 or iiab_wireless_lan_iface != "none"
   with_items:
     - "{{ ifcfg_slaves.stdout_lines }}"
 
 - name: Now delete original ifcfg files
   shell: rm -f /etc/sysconfig/network-scripts/ifcfg-"{{ item }}"
-  when: num_lan_interfaces == "1" and iiab_lan_iface != "br0"
+  when: num_lan_interfaces == 1 and iiab_lan_iface != "br0"
   with_items:
     - "{{ discovered_lan_iface }}"
 
@@ -40,7 +40,7 @@
   shell: nmcli con delete id iiab-LAN
   ignore_errors: True
   changed_when: False
-  when: (num_lan_interfaces != "0" or iiab_wireless_lan_iface != "none")
+  when: (num_lan_interfaces != 0 or iiab_wireless_lan_iface != "none")
 
 ## vars/ users should set user_wan_iface to avoid messy redetect
 - include_tasks: redetect.yml
@@ -53,8 +53,8 @@
 
 # create ifcfg-WAN if missing
 # if we get here we have gateway but no ifcfg file
-- include_tasks: create_ifcfg.yml
-  when: iiab_wan_iface != "none" and not has_WAN and has_ifcfg_gw == "none" and xo_model == "none" and not iiab_demo_mode
+#- include_tasks: create_ifcfg.yml
+#  when: iiab_wan_iface != "none" and not has_WAN and has_ifcfg_gw == "none" and xo_model == "none" and not iiab_demo_mode
 
 - name: Configuring LAN interface as iiab_lan_iface
   template: src=network/ifcfg.j2