finish getting rid of the Client classes