diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index 204840e1ac8f016ea896d931af165b9265519549..5c91366ddb2a2b5a1abe6e7d76cf7fb97ec42011 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -269,11 +269,3 @@ std::list<cta::common::dataStructures::DriveState> cta::Scheduler::getDriveState
 std::unique_ptr<cta::TapeMount> cta::Scheduler::getNextMount(const std::string &logicalLibraryName, const std::string &driveName) {
   return std::unique_ptr<TapeMount>();
 }
-
-//------------------------------------------------------------------------------
-// getNextMount
-//------------------------------------------------------------------------------
-std::unique_ptr<cta::TapeMount> cta::Scheduler::_old_getNextMount(const std::string &logicalLibraryName, const std::string & driveName) {
-  throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not implemented!");
-  return std::unique_ptr<TapeMount>();
-}
diff --git a/scheduler/Scheduler.hpp b/scheduler/Scheduler.hpp
index 550050850a4cbc6531961efd62c1aa0ae64152ad..6c67d030b01b13a26a8bc06eea9c2d9ad155612b 100644
--- a/scheduler/Scheduler.hpp
+++ b/scheduler/Scheduler.hpp
@@ -114,8 +114,6 @@ public:
 
   virtual std::unique_ptr<TapeMount> getNextMount(const std::string &logicalLibraryName, const std::string &driveName);
   
-  virtual std::unique_ptr<TapeMount> _old_getNextMount(const std::string &logicalLibraryName, const std::string & driveName);
-  
   virtual void authorizeCliIdentity(const cta::common::dataStructures::SecurityIdentity &cliIdentity);
 
 private:
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
index c77bc18ae4a9d81d1d50b28971b73504c0455bdd..7fed885a0c5f6a43e1395ae1de014a9e96993eeb 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
@@ -87,7 +87,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
   // 2a) Get initial information from the client
   std::unique_ptr<cta::TapeMount> tapeMount;
   try {
-    tapeMount.reset(m_scheduler._old_getNextMount(m_driveConfig.getLogicalLibrary(), m_driveConfig.getUnitName()).release());
+    tapeMount.reset(m_scheduler.getNextMount(m_driveConfig.getLogicalLibrary(), m_driveConfig.getUnitName()).release());
   } catch (cta::exception::Exception & e) {
     log::ScopedParamContainer localParams(lc);
     localParams.add("errorMessage", e.getMessageValue());