etcdserver: cleanup server.go