Remove dependency on hostsfile