-echo " Cleanup Started ..."
-./clean.sh
-
-sudo virsh destroy node1-control || true
-sudo virsh destroy node3-control || true
-sudo virsh destroy node4-control || true
-sudo virsh destroy node2-compute || true
-sudo virsh destroy node5-compute || true
-sudo virsh undefine node1-control || true
-sudo virsh undefine node3-control || true
-sudo virsh undefine node4-control || true
-sudo virsh undefine node2-compute || true
-sudo virsh undefine node5-compute || true
-sudo rm -rf /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node5-compute.img || true
-
-echo " Cleanup Finished ..."
+echo_info "Cleanup Started..."
+
+vm_list=$(sudo virsh list --all)
+
+for vm in node1-control node2-compute node3-control node4-control \
+ node5-compute rack-vir-m1 rack-vir-m2 rack-vir-m3 rack-vir-m4 \
+ rack-vir-m1 bootstrap
+do
+ echo "$vm_list" | grep -q " $vm " || continue
+ sudo virsh destroy $vm
+ sudo virsh undefine --nvram $vm
+ sudo rm -f /var/lib/libvirt/images/${vm}.qcow2
+done
+
+echo_info "Cleanup Finished!"