diff --git a/daemon/mgmt/tables-config-section.cpp b/daemon/mgmt/tables-config-section.cpp
index 5095da8..57230cd 100644
--- a/daemon/mgmt/tables-config-section.cpp
+++ b/daemon/mgmt/tables-config-section.cpp
@@ -24,12 +24,9 @@
  */
 
 #include "tables-config-section.hpp"
-#include "core/logger.hpp"
 
 namespace nfd {
 
-NFD_LOG_INIT("TablesConfigSection");
-
 const size_t TablesConfigSection::DEFAULT_CS_MAX_PACKETS = 65536;
 
 TablesConfigSection::TablesConfigSection(Forwarder& forwarder)
@@ -52,7 +49,6 @@
     return;
   }
 
-  NFD_LOG_INFO("Setting CS max packets to " << DEFAULT_CS_MAX_PACKETS);
   m_forwarder.getCs().setLimit(DEFAULT_CS_MAX_PACKETS);
 
   m_isConfigured = true;
@@ -83,7 +79,6 @@
     return;
   }
 
-  NFD_LOG_INFO("Setting CS max packets to " << nCsMaxPackets);
   m_forwarder.getCs().setLimit(nCsMaxPackets);
 
   m_isConfigured = true;
diff --git a/daemon/table/cs-policy.cpp b/daemon/table/cs-policy.cpp
index 3d22c1e..4e37aad 100644
--- a/daemon/table/cs-policy.cpp
+++ b/daemon/table/cs-policy.cpp
@@ -25,6 +25,9 @@
 
 #include "cs-policy.hpp"
 #include "cs.hpp"
+#include "core/logger.hpp"
+
+NFD_LOG_INIT("CsPolicy");
 
 namespace nfd {
 namespace cs {
@@ -34,13 +37,10 @@
 {
 }
 
-Policy::~Policy()
-{
-}
-
 void
 Policy::setLimit(size_t nMaxEntries)
 {
+  NFD_LOG_INFO("setLimit " << nMaxEntries);
   m_limit = nMaxEntries;
   this->evictEntries();
 }
diff --git a/daemon/table/cs-policy.hpp b/daemon/table/cs-policy.hpp
index 4beb114..b5f0200 100644
--- a/daemon/table/cs-policy.hpp
+++ b/daemon/table/cs-policy.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -43,7 +43,7 @@
   Policy(const std::string& policyName);
 
   virtual
-  ~Policy();
+  ~Policy() = default;
 
   const std::string&
   getName() const;
@@ -188,4 +188,4 @@
 } // namespace cs
 } // namespace nfd
 
-#endif // NFD_DAEMON_TABLE_CS_POLICY_HPP
\ No newline at end of file
+#endif // NFD_DAEMON_TABLE_CS_POLICY_HPP