more s3 uploader cruft