Replace other places to use aws-sdk rather than knox