diff --git a/src/socket.cpp b/src/socket.cpp
index e2c8b66..820b0a0 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -30,10 +30,6 @@
 
 namespace chronosync {
 
-const ndn::Name Socket::DEFAULT_NAME;
-const ndn::Name Socket::DEFAULT_PREFIX;
-const std::shared_ptr<Validator> Socket::DEFAULT_VALIDATOR;
-
 Socket::Socket(const Name& syncPrefix,
                const Name& userPrefix,
                ndn::Face& face,
@@ -49,14 +45,16 @@
             syncInterestLifetime, Logic::DEFAULT_SYNC_REPLY_FRESHNESS, Logic::DEFAULT_RECOVERY_INTEREST_LIFETIME,
             session)
   , m_signingId(signingId)
-  , m_validator(validator)
+  , m_validator(std::move(validator))
 {
   NDN_LOG_DEBUG(">> Socket::Socket");
+
   if (m_userPrefix != DEFAULT_NAME)
     m_registeredPrefixList[m_userPrefix] =
       m_face.setInterestFilter(m_userPrefix,
                                [this] (auto&&... args) { onInterest(std::forward<decltype(args)>(args)...); },
                                [] (auto&&...) {});
+
   NDN_LOG_DEBUG("<< Socket::Socket");
 }