-rm -f /var/lib/libvirt/images/baremetalbrbm_0.qcow2 2> /dev/null
-rm -f /var/lib/libvirt/images/baremetalbrbm_1.qcow2 2> /dev/null
+
+# Clean off baremetal VMs in case they exist
+for i in $(seq 0 $vm_index); do
+ virsh destroy baremetal$i 2> /dev/null || echo -n ''
+ virsh undefine baremetal$i 2> /dev/null || echo -n ''
+ /usr/bin/touch /var/lib/libvirt/images/baremetal${i}.qcow2
+ virsh vol-delete baremetal${i}.qcow2 --pool default 2> /dev/null
+ rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
+done
+
+# Clean off created bridges
+for bridge in ${ovs_bridges}; do
+ virsh net-destroy ${bridge} 2> /dev/null
+ virsh net-undefine ${bridge} 2> /dev/null
+ 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@instack.localdomain/d' /root/.ssh/authorized_keys
+sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys
+
+
+echo "Cleanup Completed"