diff --git a/Framework/API/src/FileFinder.cpp b/Framework/API/src/FileFinder.cpp
index 5139f80a9c26..2e77757ac952 100644
--- a/Framework/API/src/FileFinder.cpp
+++ b/Framework/API/src/FileFinder.cpp
@@ -286,7 +286,6 @@ std::string FileFinderImpl::makeFileName(const std::string &hint, const Kernel::
     filename += suffix;
   }
 
-  g_log.notice() << "makeFileName(" << hint << ", " << instrument.shortName() << ") = " << filename << ")\n";
   return filename;
 }
 
diff --git a/Framework/API/src/ISISInstrDataCache.cpp b/Framework/API/src/ISISInstrDataCache.cpp
index fcbec7165285..a3f26d20de8e 100644
--- a/Framework/API/src/ISISInstrDataCache.cpp
+++ b/Framework/API/src/ISISInstrDataCache.cpp
@@ -43,7 +43,7 @@ std::string Mantid::API::ISISInstrDataCache::getFileParentDirPath(std::string fi
   std::transform(fileName.begin(), fileName.end(), fileName.begin(), toupper);
   std::string instrName = fileName.substr(0, nChars);
   try {
-    auto instrInfo = Kernel::ConfigService::Instance().getInstrument(instrName);
+    auto instrInfo = FileFinder::Instance().getInstrument(instrName);
     instrName = instrInfo.name();
   } catch (const Kernel::Exception::NotFoundError &) {
     g_log.debug() << "Instrument name not recognized, skipping data cache search ...";
diff --git a/Framework/Kernel/src/FacilityInfo.cpp b/Framework/Kernel/src/FacilityInfo.cpp
index 328f6d4eb52d..6687d383648c 100644
--- a/Framework/Kernel/src/FacilityInfo.cpp
+++ b/Framework/Kernel/src/FacilityInfo.cpp
@@ -187,19 +187,6 @@ const InstrumentInfo &FacilityInfo::instrument(std::string iName) const {
                               [&iName](const auto &inst) { return boost::iequals(inst.shortName(), iName); });
   }
 
-  // Cover edge case where delimiter is present
-  if (instrument == m_instruments.cend()) {
-    instrument = std::find_if(m_instruments.cbegin(), m_instruments.cend(), [&iName](const auto &inst) {
-      return boost::iequals(inst.name() + inst.delimiter(), iName);
-    });
-  }
-
-  if (instrument == m_instruments.cend()) {
-    instrument = std::find_if(m_instruments.cbegin(), m_instruments.cend(), [&iName](const auto &inst) {
-      return boost::iequals(inst.shortName() + inst.delimiter(), iName);
-    });
-  }
-
   if (instrument != m_instruments.cend()) {
     g_log.debug() << "Instrument '" << iName << "' found as " << instrument->name() << " at " << name() << ".\n";
     return *instrument;