In several places the topology server selectors are still used. They are equivalent to the description server selectors, but they are a better fit to be located in the description package. Remove the server selectors from the topology package and update usage of those server selectors to instead use the description server selectors.