removing crufty cluster_name and cluster_suffix methods