Fixed a warning and removed APIs named 'ClusterController_xxx'