Remove dependency on apache httpclient