diff --git a/scripts/clean_openstack.sh b/scripts/clean_openstack.sh
index 6261f01..2104d87 100755
--- a/scripts/clean_openstack.sh
+++ b/scripts/clean_openstack.sh
@@ -42,34 +42,9 @@
 echo "Waiting 5 seconds..."
 sleep 5
 
-cleanup_network lan_network
-cleanup_network wan_network
-cleanup_network mysite_vcpe-private
-cleanup_network mysite_vsg-access
-cleanup_network mysite_veg-access
-cleanup_network management
-cleanup_network management_hosts
-
 echo "Deleting networks"
-# Delete all networks beginning with mysite_
-NETS=$( neutron net-list --all-tenants|grep mysite|awk '{print $2}' )
+NETS=$( neutron net-list|awk '{print $2}'|grep '^[0-9a-fA-F]' )
 for NET in $NETS
 do
-    neutron net-delete $NET
+    cleanup_network $NET
 done
-
-neutron net-delete lan_network || true
-neutron net-delete subscriber_network || true
-neutron net-delete public_network || true
-neutron net-delete hpc_client_network || true
-neutron net-delete ceilometer_network || true
-neutron net-delete management || true
-neutron net-delete management_hosts || true
-neutron net-delete mysite_vsg-access || true
-neutron net-delete mysite_veg-access || true
-neutron net-delete public || true
-neutron net-delete exampleservice_network || true
-neutron net-delete spgw_network || true
-neutron net-delete s11_network || true
-neutron net-delete s1u_network || true
-neutron net-delete sgi_network || true