s3: remove some unused code