Removed "optimized" code from ClusterGraph