Moved ClusterRPC to new RPC