diff --git a/epoch_base.hpp b/epoch_base.hpp
index ed761f8..e80aa09 100644
--- a/epoch_base.hpp
+++ b/epoch_base.hpp
@@ -25,8 +25,6 @@
     public PropertyChangeListner
 {
   public:
-    friend class TestEpochBase;
-
     EpochBase(sdbusplus::bus_t& bus, const char* objPath);
 
     /** @brief Notified on time mode changed */
diff --git a/manager.cpp b/manager.cpp
index 660102f..f8cd289 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -4,10 +4,7 @@
 
 #include <assert.h>
 
-#include <phosphor-logging/elog-errors.hpp>
-#include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/lg2.hpp>
-#include <xyz/openbmc_project/Common/error.hpp>
 
 namespace rules = sdbusplus::bus::match::rules;
 
@@ -25,8 +22,6 @@
 namespace time
 {
 
-using namespace phosphor::logging;
-
 Manager::Manager(sdbusplus::bus_t& bus) : bus(bus), settings(bus)
 {
     using namespace sdbusplus::bus::match::rules;
diff --git a/test/TestBmcEpoch.cpp b/test/TestBmcEpoch.cpp
index a5fdb33..0f4dbea 100644
--- a/test/TestBmcEpoch.cpp
+++ b/test/TestBmcEpoch.cpp
@@ -5,8 +5,6 @@
 
 #include <sdbusplus/bus.hpp>
 
-#include <memory>
-
 #include <gtest/gtest.h>
 
 namespace phosphor
@@ -14,8 +12,6 @@
 namespace time
 {
 
-using namespace std::chrono;
-
 class TestBmcEpoch : public testing::Test
 {
   public:
@@ -46,10 +42,6 @@
     {
         bmcEpoch->timeMode = mode;
     }
-    void triggerTimeChange()
-    {
-        bmcEpoch->onTimeChange(nullptr, -1, 0, bmcEpoch.get());
-    }
 };
 
 TEST_F(TestBmcEpoch, onModeChange)