s3: Remove some redundant code