Remove dependency with Apache HttpClient