Vinay | #1510 | Replace WebClient with HttpClient. Minor cleanup