Removing etcd as dependency