Openstack messages, and some code cleanup.