Refactor to drop the public_addresses from the ip_pickers module