cleaned up some part of cluster.cpp; more remaining