Remove unused DictLikeRestClient and subclasses
Consolidate client classes