chore($handler-cleanup): start of S3 handler refactor #1157