chore($handler-cleanup): re-org S3 XHR handler #1157