~ #19 more TODOs about removing clusterSelf