Cleanup, bucket_name bug