Moved internal services over to our http client #473