replaced ClusterClient with own impl.
code cleanups