Remove some more ClientInfo usages.