some more cleanup of the cluster code