etcdserver: cleanup cluster.go