Get rid of HttpClientHandler usage everywhere