diff --git a/src/OctonetData.cpp b/src/OctonetData.cpp
index 528fda5..404bfb3 100644
--- a/src/OctonetData.cpp
+++ b/src/OctonetData.cpp
@@ -34,23 +34,10 @@ OctonetData::OctonetData(const std::string& octonetAddress,
   if (!LoadChannelList())
     kodi::QueueFormattedNotification(QUEUE_ERROR, kodi::addon::GetLocalizedString(30001).c_str(),
                                      m_channels.size());
-
-  /*
-  // Currently unused, as thread was already present before with
-  // p8platform, by remove of them was it added as C++11 thread way.
-  kodi::Log(ADDON_LOG_INFO, "%s Starting separate client update thread...", __func__);
-  m_running = true;
-  m_thread = std::thread([&] { Process(); });
-  */
 }
 
 OctonetData::~OctonetData(void)
 {
-  /*
-  m_running = false;
-  if (m_thread.joinable())
-    m_thread.join();
-  */
 }
 
 PVR_ERROR OctonetData::GetCapabilities(kodi::addon::PVRCapabilities& capabilities)
@@ -258,11 +245,6 @@ bool OctonetData::LoadEPG(void)
   return true;
 }
 
-void OctonetData::Process()
-{
-  return;
-}
-
 PVR_ERROR OctonetData::GetChannelsAmount(int& amount)
 {
   amount = m_channels.size();
diff --git a/src/OctonetData.h b/src/OctonetData.h
index f67931f..61b988c 100644
--- a/src/OctonetData.h
+++ b/src/OctonetData.h
@@ -77,8 +77,6 @@ public:
   void CloseLiveStream() override;
 
 protected:
-  void Process();
-
   const std::string& GetUrl(int id) const;
   const std::string& GetName(int id) const;
 
@@ -95,7 +93,4 @@ private:
   std::vector<OctonetGroup> m_groups;
 
   time_t m_lastEpgLoad;
-
-  std::atomic<bool> m_running = {false};
-  std::thread m_thread;
 };