Removing explicit dependency on apache-httpclient