Cleanup. Using client that uses new HttpClient which we created for router.