A bit of reorganization and cleanup
diff --git a/xos/configurations/cord/Makefile b/xos/configurations/cord/Makefile
index 9c11927..755f704 100644
--- a/xos/configurations/cord/Makefile
+++ b/xos/configurations/cord/Makefile
@@ -16,7 +16,7 @@
 	make -C ../common -f Makefile.cloudlab
 
 ceilometer_dashboard:
-	#NOTE: The below dashboard install scripts assume 
+	#NOTE: The below dashboard install scripts assume
 	#clouldlab openstack environment created using "OpenStack" profile
 	#bash install_xos_ceilometer_dashboard.sh
 	bash install_ceilometer_patch.sh
@@ -55,7 +55,7 @@
 	# reboot the vBNG ONOS
 	cd dataplane; ansible -i hosts onos_vbng -m shell -s -a "docker restart ONOS"
 
-cleanup: stop
+cleanup:
 	cd dataplane; ./cleanup.sh
 	bash -c "source ../common/admin-openrc.sh; nova list --all-tenants; neutron net-list"
 	echo "Don't forget to clean up containers"