Fixing s3 cleanup