etcd.go removed
More cleanups