bok-choy: remove ClientFactory in two more places