Replace Deprecated Client Request/Response with ClientBuilder

When running tests or building we see lots of warnings about use of deprecated features such as ClientRequest and ClientResponse.

Should we try remove the use of these deprecated classes?

If so, is this the way to do it? Or is there a better way?