s3 cleanup fix