removed Cluster class