more Openstack cleanup