diff --git a/bin/refresh.sh b/bin/refresh.sh
index b2c5ac84..d5fce453 100755
--- a/bin/refresh.sh
+++ b/bin/refresh.sh
@@ -6,7 +6,7 @@ echo "You may run '/opt/compass/bin/clean_nodes.sh' to clean nodes on chef serve
 echo "You may run '/opt/compass/bin/clean_clients.sh' to clean clients on chef server"
 echo "you may run '/opt/compass/bin/clean_environments.sh' to clean environments on chef server"
 echo "you may run '/opt/compass/bin/remove_systems.sh' to clean systems on cobbler"
-/opt/compass/bin/clean_installation_logs.py
+#/opt/compass/bin/clean_installation_logs.py
 service httpd restart
 service rsyslog restart
 service redis restart
diff --git a/compass/actions/poll_switch.py b/compass/actions/poll_switch.py
index 639cd7d5..dc42c2a1 100644
--- a/compass/actions/poll_switch.py
+++ b/compass/actions/poll_switch.py
@@ -96,10 +96,8 @@ def _poll_switch(ip_addr, credentials, req_obj='mac', oper="SCAN"):
     )
 
 
-def poll_switch(
-    poller_email, ip_addr, credentials,
-    req_obj='mac', oper="SCAN"
-):
+def poll_switch(poller_email, ip_addr, credentials,
+                req_obj='mac', oper="SCAN"):
     """Query switch and update switch machines.
 
     .. note::
@@ -130,19 +128,15 @@ def poll_switch(
         switch_dict, machine_dicts = _poll_switch(
             ip_addr, credentials, req_obj=req_obj, oper=oper
         )
-        switches = switch_api.list_switches(
-            poller, ip_int=ip_int
-        )
+        switches = switch_api.list_switches(poller, ip_int=ip_int)
         if not switches:
             logging.error('no switch found for %s', ip_addr)
             return
 
         for switch in switches:
-            switch_api.update_switch(
-                poller, switch['id'], **switch_dict
-            )
             for machine_dict in machine_dicts:
                 print 'add machine: %s' % machine_dict
                 switch_api.add_switch_machine(
                     poller, switch['id'], False, **machine_dict
                 )
+                switch_api.update_switch(poller, switch['id'], **switch_dict)
diff --git a/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl b/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
index 95376a3f..5c99d8ca 100644
--- a/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
+++ b/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
@@ -19,7 +19,6 @@
 ## Network worker node management IP/interface
 #set network_worker_ip = $network_worker_role.management.ip
 #set network_worker_nic = $network_worker_role.management.interface
-#set network_worker_tenant_nic = $network_worker_role.tenant.interface
 #set network_worker_public_nic = $network_worker_role.public.interface
 
 ## Database node management IP
@@ -278,9 +277,6 @@
         "network-api-bind": {
           "bind_interface": "$network_server_nic"
         },
-        "network-openvswitch": {
-          "bind_interface": "$network_worker_tenant_nic"
-        },
         "orchestration-api": {
           "host": "$controller_ip",
           "scheme": "http",