etcd: cleanup etcd.go