s3: Remove unused code