More tolerant buckets clean up