Remove HttpClient dep