Continued cleanup for openstack swift support