some cleanup of Openstack topics
some cleanup of Openstack topics