Remove extra setup of serviceName in S3