fix etcd cleanup logic