diff --git a/buffet/peerd_client.cc b/buffet/peerd_client.cc
deleted file mode 100644
index 88de4ca..0000000
--- a/buffet/peerd_client.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "buffet/peerd_client.h"
-
-#include <map>
-#include <vector>
-
-#include <base/message_loop/message_loop.h>
-#include <brillo/errors/error.h>
-#include <brillo/strings/string_utils.h>
-
-using org::chromium::peerd::PeerProxy;
-
-namespace buffet {
-
-namespace {
-
-// Commit changes only if no update request happened during the timeout.
-// Usually updates happen in batches, so we don't want to flood network with
-// updates relevant for a short amount of time.
-const int kCommitTimeoutSeconds = 1;
-
-void OnError(const std::string& operation, brillo::Error* error) {
-  LOG(ERROR) << operation << " failed:" << error->GetMessage();
-}
-
-const char kExpectedServiceType[] = "_privet._tcp";
-const char kServiceName[] = "privet";
-
-}  // namespace
-
-PeerdClient::PeerdClient(const scoped_refptr<dbus::Bus>& bus)
-    : peerd_object_manager_proxy_{bus} {
-  peerd_object_manager_proxy_.SetManagerAddedCallback(
-      base::Bind(&PeerdClient::OnPeerdOnline, weak_ptr_factory_.GetWeakPtr()));
-  peerd_object_manager_proxy_.SetManagerRemovedCallback(
-      base::Bind(&PeerdClient::OnPeerdOffline, weak_ptr_factory_.GetWeakPtr()));
-}
-
-PeerdClient::~PeerdClient() {
-  RemoveService();
-}
-
-void PeerdClient::PublishService(const std::string& service_type,
-                                 uint16_t port,
-                                 const std::vector<std::string>& txt) {
-  // Only one service supported.
-  CHECK_EQ(service_type, kExpectedServiceType);
-  port_ = port;
-  txt_ = txt;
-  Update();
-}
-
-void PeerdClient::StopPublishing(const std::string& service_type) {
-  // Only one service supported.
-  CHECK_EQ(service_type, kExpectedServiceType);
-  port_ = 0;
-  Update();
-}
-
-void PeerdClient::Update() {
-  // Abort pending updates, and wait for more changes.
-  restart_weak_ptr_factory_.InvalidateWeakPtrs();
-  base::MessageLoop::current()->PostDelayedTask(
-      FROM_HERE, base::Bind(&PeerdClient::UpdateImpl,
-                            restart_weak_ptr_factory_.GetWeakPtr()),
-      base::TimeDelta::FromSeconds(kCommitTimeoutSeconds));
-}
-
-void PeerdClient::OnPeerdOnline(
-    org::chromium::peerd::ManagerProxy* manager_proxy) {
-  peerd_manager_proxy_ = manager_proxy;
-  VLOG(1) << "Peerd manager is online at '"
-          << manager_proxy->GetObjectPath().value() << "'.";
-  Update();
-}
-
-void PeerdClient::OnPeerdOffline(const dbus::ObjectPath& object_path) {
-  peerd_manager_proxy_ = nullptr;
-  VLOG(1) << "Peerd manager is now offline.";
-}
-
-void PeerdClient::ExposeService() {
-  // Do nothing if peerd hasn't started yet.
-  if (peerd_manager_proxy_ == nullptr)
-    return;
-  VLOG(1) << "Starting peerd advertising.";
-  CHECK_NE(port_, 0);
-  CHECK(!txt_.empty());
-  std::map<std::string, brillo::Any> mdns_options{
-      {"port", brillo::Any{port_}},
-  };
-
-  std::map<std::string, std::string> txt;
-  for (const auto& record : txt_) {
-    auto name_value = brillo::string_utils::SplitAtFirst(record, "=");
-    CHECK(!name_value.second.empty());
-    txt.emplace(std::move(name_value));
-  }
-
-  published_ = true;
-  peerd_manager_proxy_->ExposeServiceAsync(
-      kServiceName, txt, {{"mdns", mdns_options}}, base::Closure(),
-      base::Bind(&OnError, "ExposeService"));
-}
-
-void PeerdClient::RemoveService() {
-  if (peerd_manager_proxy_ == nullptr)
-    return;
-
-  VLOG(1) << "Stopping peerd advertising.";
-  if (published_) {
-    published_ = false;
-    peerd_manager_proxy_->RemoveExposedServiceAsync(
-        kServiceName, base::Closure(), base::Bind(&OnError, "RemoveService"));
-  }
-}
-
-void PeerdClient::UpdateImpl() {
-  if (port_ == 0)
-    return RemoveService();
-  ExposeService();
-}
-
-}  // namespace buffet
diff --git a/buffet/peerd_client.h b/buffet/peerd_client.h
deleted file mode 100644
index 8a783f0..0000000
--- a/buffet/peerd_client.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef BUFFET_PEERD_CLIENT_H_
-#define BUFFET_PEERD_CLIENT_H_
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <base/callback.h>
-#include <base/memory/ref_counted.h>
-#include <weave/provider/dns_service_discovery.h>
-
-#include "peerd/dbus-proxies.h"
-
-namespace dbus {
-class Bus;
-}  // namespace dbus
-
-namespace buffet {
-
-// Publishes privet service on mDns using peerd.
-class PeerdClient : public weave::provider::DnsServiceDiscovery {
- public:
-  explicit PeerdClient(const scoped_refptr<dbus::Bus>& bus);
-  ~PeerdClient() override;
-
-  // Mdns implementation.
-  void PublishService(const std::string& service_type,
-                      uint16_t port,
-                      const std::vector<std::string>& txt) override;
-  void StopPublishing(const std::string& service_type) override;
-
- private:
-  void OnPeerdOnline(org::chromium::peerd::ManagerProxy* manager_proxy);
-  void OnPeerdOffline(const dbus::ObjectPath& object_path);
-
-  // Updates published information.  Removes service if HTTP is not alive.
-  void Update();
-
-  void ExposeService();
-  void RemoveService();
-
-  void UpdateImpl();
-
-  org::chromium::peerd::ObjectManagerProxy peerd_object_manager_proxy_;
-  // |peerd_manager_proxy_| is owned by |peerd_object_manager_proxy_|.
-  org::chromium::peerd::ManagerProxy* peerd_manager_proxy_{nullptr};
-
-  bool published_{false};
-  uint16_t port_{0};
-  std::vector<std::string> txt_;
-
-  base::WeakPtrFactory<PeerdClient> restart_weak_ptr_factory_{this};
-  base::WeakPtrFactory<PeerdClient> weak_ptr_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(PeerdClient);
-};
-
-}  // namespace buffet
-
-#endif  // BUFFET_PEERD_CLIENT_H_