etcdserver: clean up