s3: Remove some unused code