Remove logic related to the zone client.