-# Clean off brbm bridges
-virsh net-destroy brbm 2> /dev/null
-virsh net-undefine brbm 2> /dev/null
-vs-vsctl del-br brbm 2> /dev/null
+for network in ${OPNFV_NETWORK_TYPES}; do
+ virsh net-destroy ${network} 2> /dev/null
+ virsh net-undefine ${network} 2> /dev/null
+done
+
+# Clean off created bridges
+for bridge in ${ovs_bridges}; do
+ if detach_interface_from_ovs ${bridge} 2> /dev/null; then
+ ovs-vsctl del-br ${bridge} 2> /dev/null
+ fi
+done
+
+# clean pub keys from root's auth keys
+sed -i '/stack@undercloud.localdomain/d' /root/.ssh/authorized_keys
+sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys
+