Enchnced S3 cleanup