etcd: refactor remove