diff --git a/scheduler/CMakeLists.txt b/scheduler/CMakeLists.txt
index 38e1bcace0c60f835e79993f1dd4075313231a47..edb019ce928c2d5dc9ba001a7485999b12d28994 100644
--- a/scheduler/CMakeLists.txt
+++ b/scheduler/CMakeLists.txt
@@ -52,9 +52,6 @@ install (TARGETS ctascheduler DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
 
 target_link_libraries (ctascheduler ctacommon ctaobjectstore ${PROTOBUF3_LIBRARIES} ctadisk)
 
-#add_library (ctaschedulerutils SHARED
-#  _old_prototype_DummyScheduler.cpp)
-
 add_library (ctaschedulerunittests SHARED
   SchedulerDatabaseFactory.cpp
   SchedulerDatabaseTest.cpp
@@ -63,10 +60,6 @@ add_library (ctaschedulerunittests SHARED
 set_property(TARGET ctaschedulerunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
 set_property(TARGET ctaschedulerunittests PROPERTY   VERSION "${CTA_LIBVERSION}")
 
-set_property(SOURCE OStoreDB/OStoreDBTest.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unused-function")
-set_property(SOURCE SchedulerDatabaseTest.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unused-function")
-set_property(SOURCE SchedulerTest.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unused-function")
-
 target_link_libraries (ctaschedulerunittests
   ctascheduler)
 
diff --git a/scheduler/OStoreDB/OStoreDBFactory.hpp b/scheduler/OStoreDB/OStoreDBFactory.hpp
index c4cf6b2ef1eadfd614333ea188faf08fa7fe0fe2..c6a21742b788509457967856556a99d61d7f430e 100644
--- a/scheduler/OStoreDB/OStoreDBFactory.hpp
+++ b/scheduler/OStoreDB/OStoreDBFactory.hpp
@@ -311,42 +311,6 @@ m_OStoreDB(*m_backend, *m_catalogue, *m_logger),
   m_OStoreDB.setAgentReference(m_agentReferencePtr.get());
 }
 
-template <>
-OStoreDBWrapper<cta::objectstore::BackendRados>::OStoreDBWrapper(
-        const std::string &context,std::unique_ptr<cta::catalogue::Catalogue> & catalogue, const std::string &URL) :
-m_logger(new cta::log::DummyLogger("", "")), m_backend(cta::objectstore::BackendFactory::createBackend(URL, *m_logger).release()),
-m_catalogue(catalogue),
-m_OStoreDB(*m_backend, *m_catalogue, *m_logger),
-  m_agentReferencePtr(new objectstore::AgentReference("OStoreDBFactory", *m_logger))
-{
-  // We need to first clean up possible left overs in the pool
-  auto l = m_backend->list();
-  for (auto o=l.begin(); o!=l.end(); o++) {
-    try {
-      m_backend->remove(*o);
-    } catch (std::exception &) {}
-  }
-  // We need to populate the root entry before using.
-  objectstore::RootEntry re(*m_backend);
-  re.initialize();
-  re.insert();
-  objectstore::ScopedExclusiveLock rel(re);
-  re.fetch();
-  objectstore::Agent agent(m_agentReferencePtr->getAgentAddress(), *m_backend);
-  agent.initialize();
-  objectstore::EntryLogSerDeser cl("user0", "systemhost", time(NULL));
-  log::LogContext lc(*m_logger);
-  re.addOrGetAgentRegisterPointerAndCommit(*m_agentReferencePtr, cl, lc);
-  rel.release();
-  agent.insertAndRegisterSelf(lc);
-  rel.lock(re);
-  re.fetch();
-  re.addOrGetDriveRegisterPointerAndCommit(*m_agentReferencePtr, cl);
-  re.addOrGetSchedulerGlobalLockAndCommit(*m_agentReferencePtr, cl);
-  rel.release();
-  m_OStoreDB.setAgentReference(m_agentReferencePtr.get());
-}
-
 }
 
 /**
diff --git a/tapeserver/castor/tape/tapeserver/daemon/CMakeLists.txt b/tapeserver/castor/tape/tapeserver/daemon/CMakeLists.txt
index d1e6231499331be928a643767d0b007bd4412495..768d6a07077d140baaf2e9c0aebbb3842ba79369 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/CMakeLists.txt
+++ b/tapeserver/castor/tape/tapeserver/daemon/CMakeLists.txt
@@ -48,9 +48,6 @@ set(CTATAPESERVERDAEMON_LIBRARY_SRCS
   TapeWriteSingleThread.cpp
   TapeWriteTask.cpp)
 
-# Add -Wno-unused-function compiler flag
-set_property(SOURCE DataTransferSessionTest.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unused-function")
-
 add_library(ctaTapeServerDaemon
   ${CTATAPESERVERDAEMON_LIBRARY_SRCS})