Remove HttpComponents dependency