diff --git a/core/common.hpp b/core/common.hpp
index 5a45420..9770a05 100644
--- a/core/common.hpp
+++ b/core/common.hpp
@@ -81,7 +81,6 @@
 using boost::noncopyable;
 
 namespace signal = util::signal;
-namespace scheduler = util::scheduler;
 
 } // namespace ndn
 
diff --git a/tools/peek/ndnpoke/main.cpp b/tools/peek/ndnpoke/main.cpp
index 976fcd7..2086a2b 100644
--- a/tools/peek/ndnpoke/main.cpp
+++ b/tools/peek/ndnpoke/main.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2018,  Regents of the University of California,
+ * Copyright (c) 2014-2019,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -162,7 +162,6 @@
   boost::asio::io_service io;
   Face face(io);
   KeyChain keyChain;
-  scheduler::Scheduler scheduler(io);
   NdnPoke program(face, keyChain, std::cin, options);
   try {
     program.start();
diff --git a/tools/ping/client/ping.hpp b/tools/ping/client/ping.hpp
index ce4119d..f2a78d9 100644
--- a/tools/ping/client/ping.hpp
+++ b/tools/ping/client/ping.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2015-2016,  Arizona Board of Regents.
+/*
+ * Copyright (c) 2015-2019,  Arizona Board of Regents.
  *
  * This file is part of ndn-tools (Named Data Networking Essential Tools).
  * See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -167,7 +167,7 @@
   uint64_t m_nextSeq;
   int m_nOutstanding;
   Face& m_face;
-  scheduler::Scheduler m_scheduler;
+  Scheduler m_scheduler;
   scheduler::ScopedEventId m_nextPingEvent;
 };