Purged even more. Removed the dependency on Apache HttpClient