diff --git a/Trigger/TrigT1/TrigT1RoIB/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigT1/TrigT1RoIB/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..1370cdbfd24748e49024bb77bde05d5976353a57
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1RoIB/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigT1/TrigT1RoIB
diff --git a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
index 6c09ece6f34181f23f623d9407d5ef455a8371e0..2051ecd86875461afe8bbe5b71b65e4f5667cb61 100644
--- a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /*
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
@@ -23,9 +23,6 @@ algorithms to access the ROIB::RoIBResult and ROIB::RecRoIBResult objects.
   - ROIB::RoIBuilder: simulation of the RoIBuilder process between LVL1 and LVL2
   - TrigT1RoIBConfig::RoIBuilder: algorithm configuration for running in a reconstruction job (rerunning LVL1)
   - TrigT1RoIBConfig::RoIBuilderInDigi: algorithm configuration for running in a digitization job
-  - CBNTAA_ReadRoIBResult: CBNT for ROIB::RoIBResult class
-  - ROIB::RoIBTester: test algorithm for dumping ROIB::RoIBResult class
-  - ROIB::RecRoIBTester: test algorithm for dumping ROIB::RecRoIBResult class
 
 @section TrigT1RoIB_TrigT1RoIBJobOptions Job Options
   The algorithms of the TrigT1RoIB package can be configured using configurables.
@@ -39,9 +36,6 @@ algorithms to access the ROIB::RoIBResult and ROIB::RecRoIBResult objects.
 
   The list of properties for each algorithm can be found here:
   - @link ROIB::RoIBuilder::RoIBuilder @endlink
-  - @link CBNTAA_ReadRoIBResult::CBNTAA_ReadRoIBResult @endlink
-  - @link ROIB::RoIBTester::RoIBTester @endlink
-  - @link ROIB::RecRoIBTester::RecRoIBTester @endlink
 
 @section TrigT1RoIB_TrigT1RoIB Extra Pages
 
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.cxx b/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.cxx
deleted file mode 100644
index bb338ce4e53d5bc900ce8d3c2f74c8f35e43c89d..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.cxx
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RecRoIBTester.cxx 550415 2013-06-10 09:36:28Z pottgen $
-
-// STL includes:
-#include <string>
-#include <vector>
-#include <iomanip>
-
-// Gaudi/Athena include(s):
-#include "AthenaKernel/errorcheck.h"
-
-// TrigT1 includes:
-#include "TrigT1Result/RecRoIBResult.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigT1Interfaces/RecMuonRoI.h"
-#include "TrigT1Interfaces/RecJetRoI.h"
-//#include "TrigT1Interfaces/TriggerThreshold.h"
-//#include "TrigT1Interfaces/TriggerThresholdValue.h"
-#include "TrigT1Interfaces/JEPRoIDecoder.h"
-
-// Local include(s):
-#include "RecRoIBTester.h"
-
-namespace ROIB {
-
-   //--------------
-   // Constructor
-   //--------------
-   RecRoIBTester::RecRoIBTester( const std::string& name, ISvcLocator* pSvcLocator )
-      : AthAlgorithm( name, pSvcLocator ) {
-
-   }
-
-   //---------------------------------
-   // initialize()
-   //---------------------------------
-   StatusCode RecRoIBTester::initialize() {
-
-      ATH_MSG_INFO( "Initializing " << name() << " algorithm " 
-                    << " - package version " << PACKAGE_VERSION );
-
-      return StatusCode::SUCCESS;
-   }
-
-   //---------------------------------
-   // finalize()
-   //---------------------------------
-   StatusCode RecRoIBTester::finalize() {
-
-      ATH_MSG_INFO( "Finalizing " << name()
-                    << " - package version " << PACKAGE_VERSION );
-
-      return StatusCode::SUCCESS;
-   }
-
-   //----------------------------------------------
-   // execute() method called once per event
-   //----------------------------------------------
-   StatusCode RecRoIBTester::execute( ) {
-
-      // Return right away if we're not going to print anything anyway:
-      if( ! msgLvl( MSG::DEBUG ) ) {
-         return StatusCode::SUCCESS;
-      }
-
-      // Exec message
-      ATH_MSG_DEBUG( "====================================" );
-      ATH_MSG_DEBUG( "Execution of RecRoIB test algorithm." );
-      ATH_MSG_DEBUG( "====================================" );
-
-      // Get RoIB RDO object back from SG:
-      const RecRoIBResult* roib_rdo = 0;
-      CHECK( evtStore()->retrieve( roib_rdo ) );
-
-      //
-      // Test RoIB RDO object from store:
-      //
-      ATH_MSG_DEBUG( "==============================" );
-      ATH_MSG_DEBUG( "Printing EmTau RoI information" );
-      ATH_MSG_DEBUG( "==============================" );
-
-      std::vector< LVL1::RecEmTauRoI >::const_iterator emtau_itr =
-         roib_rdo->recEmTauRoIVector().begin();
-      std::vector< LVL1::RecEmTauRoI >::const_iterator emtau_end =
-         roib_rdo->recEmTauRoIVector().end();
-      for( ; emtau_itr != emtau_end; ++emtau_itr ) {
-
-         ATH_MSG_DEBUG( "  --> The EmTau RoI " << std::ios::hex << emtau_itr->roiWord()
-                        << ' ' << std::ios::dec << emtau_itr->phi() << ' '
-                        << std::ios::dec << emtau_itr->eta() );
-
-         std::vector< unsigned int >::const_iterator thr_itr =
-            emtau_itr->thresholdsPassed()->begin();
-         std::vector< unsigned int >::const_iterator thr_end =
-            emtau_itr->thresholdsPassed()->end();
-         for( ; thr_itr != thr_end; ++thr_itr ) {
-            ATH_MSG_DEBUG( "    - passed threshold (number / GeV) : "
-                           << *thr_itr << " / " << emtau_itr->triggerThreshold( *thr_itr )
-                           << " ( " << emtau_itr->emIsolation( *thr_itr )
-                           << " / " << emtau_itr->hadIsolation( *thr_itr )
-                           << " / " << emtau_itr->hadCoreIsolation( *thr_itr )
-                           << " )" );
-         }
-      }
-
-      ATH_MSG_DEBUG( "=============================" );
-      ATH_MSG_DEBUG( "Printing Muon RoI information" );
-      ATH_MSG_DEBUG( "=============================" );
-
-      std::vector< LVL1::RecMuonRoI >::const_iterator muon_itr =
-         roib_rdo->recMuonRoIVector().begin();
-      std::vector< LVL1::RecMuonRoI >::const_iterator muon_end =
-         roib_rdo->recMuonRoIVector().end();
-      for( ; muon_itr != muon_end; ++muon_itr ) {
-
-         ATH_MSG_DEBUG( "  --> The Muon RoI " << muon_itr->roiWord() << ' '
-                        << muon_itr->phi() << ' ' << muon_itr->eta() << ' '
-                        << muon_itr->sysID() << ' ' << muon_itr->subsysID() << ' '
-                        << muon_itr->sectorID() );
-
-         if( muon_itr->getThresholdValue() == 0 ) {
-            REPORT_MESSAGE( MSG::WARNING )
-               << "     --- threshold number " << muon_itr->getThresholdNumber()
-               << " was not configured in thresholds' XML file";
-         } else {
-            ATH_MSG_DEBUG( "    - passed threshold (number / GeV) : "
-                           << muon_itr->getThresholdNumber() << " / "
-                           << muon_itr->getThresholdValue() );
-         }
-      }
-
-      ATH_MSG_DEBUG( "============================" );
-      ATH_MSG_DEBUG( "Printing Jet RoI information" );
-      ATH_MSG_DEBUG( "============================" );
-
-      std::vector< LVL1::RecJetRoI >::const_iterator jet_itr =
-         roib_rdo->recJetRoIVector().begin();
-      std::vector< LVL1::RecJetRoI >::const_iterator jet_end =
-         roib_rdo->recJetRoIVector().end();
-      for( ; jet_itr != jet_end; ++jet_itr ) {
-
-         static LVL1::JEPRoIDecoder jep_decoder;
-
-         // if energy
-         if( jep_decoder.roiType( jet_itr->roiWord() ) > 2 ) {
-
-            ATH_MSG_DEBUG( " The energy situation : of type "
-                           << jep_decoder.roiType( jet_itr->roiWord() )
-                           << " has the RoI word " << jet_itr->roiWord() );
-
-            if( jep_decoder.roiType( jet_itr->roiWord() ) == 3 ) {
-
-               ATH_MSG_DEBUG( " --- energy X = "
-                              << jep_decoder.energyX( jet_itr->roiWord() ) );
-
-            } else if( jep_decoder.roiType( jet_itr->roiWord() ) == 4 ) {
-
-               ATH_MSG_DEBUG( " --- energy Y = "
-                              << jep_decoder.energyY( jet_itr->roiWord() ) );
-               //FIXME ... this should work now, but please test (ATW)
-               const std::vector< unsigned int > sumPassed =
-                  jep_decoder.etSumThresholdsPassed( jet_itr->roiWord() );
-               if( sumPassed.size() ) {
-                  ATH_MSG_DEBUG( " --- Etsum thresholds passed :" );
-                  std::vector< unsigned int >::const_iterator thr_itr =
-                     sumPassed.begin();
-                  std::vector< unsigned int >::const_iterator thr_end =
-                     sumPassed.end();
-                  for( ; thr_itr != thr_end; ++thr_itr ) {
-                     ATH_MSG_DEBUG( "         " << *thr_itr );
-                  }
-               }
-
-            } else if( jep_decoder.roiType( jet_itr->roiWord() ) == 5 ) {
-
-               ATH_MSG_DEBUG( " energy T = "
-                              << jep_decoder.energyT( jet_itr->roiWord() ) );
-               //FIXME ... this should work now, but please test (ATW)
-               const std::vector< unsigned int > missPassed =
-                  jep_decoder.etMissThresholdsPassed( jet_itr->roiWord() );
-               if( missPassed.size() ) {
-                  ATH_MSG_DEBUG( " --- Etmiss thresholds passed :" );
-                  std::vector< unsigned int >::const_iterator thr_itr =
-                     missPassed.begin();
-                  std::vector< unsigned int >::const_iterator thr_end =
-                     missPassed.end();
-                  for( ; thr_itr != thr_end; ++thr_itr ) {
-                     ATH_MSG_DEBUG( "         " << *thr_itr );
-                  }
-               }
-            }
-
-         }
-         // if we are talking about jet RoIs with type = 1
-         else if( jep_decoder.roiType( jet_itr->roiWord() ) == 1 ) {
-
-            ATH_MSG_DEBUG( " The Jet RoI " << jet_itr->roiWord() << ' '
-                           << jet_itr->phi() << ' ' << jet_itr->eta() );
-
-            // You need to ask the RecJetRoI whether it is a central or forward jet.
-            // thresholdPassed() will supply the vector of threshold numbers for
-            // whichever type it is
-            std::vector< unsigned int >::const_iterator thr_itr =
-               jet_itr->thresholdsPassed()->begin();
-            std::vector< unsigned int >::const_iterator thr_end =
-               jet_itr->thresholdsPassed()->end();
-            for( ; thr_itr != thr_end; ++thr_itr ) {
-               if( ! jet_itr->isForwardJet() ) {
-                  ATH_MSG_DEBUG( "- passed threshold (number / GeV) : "
-                                 << *thr_itr << " / "
-                                 << jet_itr->triggerThreshold( *thr_itr ) << " ( "
-                                 << jet_itr->windowSize( *thr_itr ) << " /" );
-               }
-               else {
-                  ATH_MSG_DEBUG( "- passed forward threshold (number / GeV) : "
-                                 << *thr_itr << " / "
-                                 << jet_itr->triggerThreshold( *thr_itr ) << " ( "
-                                 << jet_itr->windowSize( *thr_itr ) << " /" );
-               }
-            }
-
-         }
-         // if we are talking about the summed jet et word.
-         else if( jep_decoder.roiType( jet_itr->roiWord() ) == 2 ) {
-
-            // FIXME code not yet provided to get thre threshold and the value.
-            ATH_MSG_DEBUG( " The Summed Jet Et RoI is " << jet_itr->roiWord()
-                           << " This still needs some code to fill it!" );
-
-         }
-
-      }
-
-      // Return happily!
-      return StatusCode::SUCCESS;
-   }
-
-} // end of  namespace bracket
-
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.h b/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.h
deleted file mode 100644
index ad922acffea6dfeb3b0173b903e02e904941da96..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RecRoIBTester.h 500598 2012-05-14 15:39:58Z krasznaa $
-#ifndef TRIGT1ROIB_RECROIBTESTER_H
-#define TRIGT1ROIB_RECROIBTESTER_H
-
-// Athena/Gaudi include(s):
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-namespace ROIB {
-
-   /**
-    *  @short Dump ROIB::RecRoIBResult for testing purpose
-    *
-    *         RecRoIBTester takes L1 reconstructed RDO (ROIB::RecRoIBResult)
-    *         from storegate and tests/prints it.
-    *
-    * @author Thomas Schoerner-Sadenius <thomas.schoerner@cern.ch>
-    * @author last commit \$Author: efeld $
-    *
-    * $Revision: 500598 $
-    * $Date: 2012-05-14 17:39:58 +0200 (Mon, 14 May 2012) $
-    */
-   class RecRoIBTester : public AthAlgorithm {
-
-   public:
-      /// Standard Gaudi Athena constructor
-      RecRoIBTester( const std::string& name, ISvcLocator* pSvcLocator );
-
-      // standard algorithm methods:
-      virtual StatusCode initialize();
-      virtual StatusCode execute();
-      virtual StatusCode finalize();
-
-   }; // class RecRoIBTester
-
-} // namespace ROIB
-
-#endif // TRIGT1ROIB_RECROIBTESTER_H
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.cxx b/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.cxx
deleted file mode 100644
index ff566ad3b6b43f43a5e9b9300dd99541f0aa73f7..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.cxx
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RoIBTester.cxx 500598 2012-05-14 15:39:58Z krasznaa $
-
-// STL includes:
-#include <iomanip>
-#include <vector>
-
-// Gaudi/Athena include(s):
-#include "AthenaKernel/errorcheck.h"
-
-// TrigT1 include(s):
-#include "TrigT1Interfaces/TrigT1StoreGateKeys.h"
-#include "TrigT1Result/RoIBResult.h"
-
-// Local include(s):
-#include "RoIBTester.h"
-
-namespace ROIB {
-
-   //--------------
-   // Constructor
-   //--------------
-   RoIBTester::RoIBTester( const std::string& name, ISvcLocator* pSvcLocator )
-      : AthAlgorithm( name, pSvcLocator ) {
-
-      // Properties for data object locations in StoreGate
-      declareProperty( "RoIBRDOLocation",
-                       m_roibRDOLocation = ROIB::DEFAULT_RoIBRDOLocation,
-                       "StoreGate location of RoIB RDO" );
-   }
-
-   //---------------------------------
-   // initialize()
-   //---------------------------------
-   StatusCode RoIBTester::initialize() {
-
-      ATH_MSG_INFO( "Initializing " << name() << " algorithm " 
-                    << " - package version " << PACKAGE_VERSION );
-
-      return StatusCode::SUCCESS;
-   }
-
-   //---------------------------------
-   // finalize()
-   //---------------------------------
-   StatusCode RoIBTester::finalize() {
-
-      ATH_MSG_INFO( "Finalizing " << name()
-                    << " - package version " << PACKAGE_VERSION );
-
-      return StatusCode::SUCCESS;
-   }
-
-   //----------------------------------------------
-   // execute() method called once per event
-   //----------------------------------------------
-   StatusCode RoIBTester::execute() {
-
-      // Return right away if we're not going to print anything anyway:
-      if( ! msgLvl( MSG::DEBUG ) ) {
-         return StatusCode::SUCCESS;
-      }
-
-      // Exec message
-      ATH_MSG_DEBUG( "=================================" );
-      ATH_MSG_DEBUG( "Execution of RoIB test algorithm." );
-      ATH_MSG_DEBUG( "=================================" );
-
-      // Get RoIB RDO object back from SG:
-      const RoIBResult* roib_rdo = 0;
-      CHECK( evtStore()->retrieve( roib_rdo, m_roibRDOLocation ) );
-
-      //
-      // Test RoIB RDO object from store:
-      //
-      ATH_MSG_DEBUG( "<---- new CTP slink ---->" );
-      ATH_MSG_DEBUG( "Header marker : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().headerMarker() );
-      ATH_MSG_DEBUG( "Header size   : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().headerSize() );
-      ATH_MSG_DEBUG( "Format version: 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().formatVersion() );
-      ATH_MSG_DEBUG( "Source ID     : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().sourceID() );
-      ATH_MSG_DEBUG( "L1 ID         : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().L1ID() );
-      ATH_MSG_DEBUG( "BCID          : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().BCID() );
-      ATH_MSG_DEBUG( "Trigger type  : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().triggerType() );
-      ATH_MSG_DEBUG( "Event type    : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().header().eventType() );
-
-      std::vector< CTPRoI >::const_iterator ctp_itr =
-         roib_rdo->cTPResult().roIVec().begin();
-      std::vector< CTPRoI >::const_iterator ctp_end =
-         roib_rdo->cTPResult().roIVec().end();
-      for( ; ctp_itr != ctp_end; ++ctp_itr ) {
-         ATH_MSG_DEBUG( "  --> RoI = 0x" << std::ios::hex << ctp_itr->roIWord() );
-      }
-
-      ATH_MSG_DEBUG( "Error status  : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().trailer().errorStatus() );
-      ATH_MSG_DEBUG( "Status info   : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().trailer().statusInfo() );
-      ATH_MSG_DEBUG( "St. wrd. num. : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().trailer().numStatusWords() );
-      ATH_MSG_DEBUG( "Da. wrd. num. : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().trailer().numDataWords() );
-      ATH_MSG_DEBUG( "Status pos.   : 0x" << std::ios::hex
-                     << roib_rdo->cTPResult().trailer().statusPosition() );
-
-      std::vector< EMTauResult >::const_iterator emtau_itr =
-         roib_rdo->eMTauResult().begin();
-      std::vector< EMTauResult >::const_iterator emtau_end =
-         roib_rdo->eMTauResult().end();
-      for( ; emtau_itr != emtau_end; ++emtau_itr ) {
-
-         ATH_MSG_DEBUG( "<---- new egamma slink ---->" );
-         ATH_MSG_DEBUG( "Header marker : 0x" << std::ios::hex
-                        << emtau_itr->header().headerMarker() );
-         ATH_MSG_DEBUG( "Header size   : 0x" << std::ios::hex
-                        << emtau_itr->header().headerSize() );
-         ATH_MSG_DEBUG( "Format version: 0x" << std::ios::hex
-                        << emtau_itr->header().formatVersion() );
-         ATH_MSG_DEBUG( "Source ID     : 0x" << std::ios::hex
-                        << emtau_itr->header().sourceID() );
-         ATH_MSG_DEBUG( "L1 ID         : 0x" << std::ios::hex
-                        << emtau_itr->header().L1ID() );
-         ATH_MSG_DEBUG( "BCID          : 0x" << std::ios::hex
-                        << emtau_itr->header().BCID() );
-         ATH_MSG_DEBUG( "Trigger type  : 0x" << std::ios::hex
-                        << emtau_itr->header().triggerType() );
-         ATH_MSG_DEBUG( "Event type    : 0x" << std::ios::hex
-                        << emtau_itr->header().eventType() );
-
-         std::vector< EMTauRoI >::const_iterator roi_itr =
-            emtau_itr->roIVec().begin();
-         std::vector< EMTauRoI >::const_iterator roi_end =
-            emtau_itr->roIVec().end();
-         for( ; roi_itr != roi_end; ++roi_itr ) {
-            ATH_MSG_DEBUG( "  --> RoI = 0x" << std::ios::hex << roi_itr->roIWord() );
-         }
-
-         ATH_MSG_DEBUG( "Error status  : 0x" << std::ios::hex
-                        << emtau_itr->trailer().errorStatus() );
-         ATH_MSG_DEBUG( "Status info   : 0x" << std::ios::hex
-                        << emtau_itr->trailer().statusInfo() );
-         ATH_MSG_DEBUG( "St. wrd. num. : 0x" << std::ios::hex
-                        << emtau_itr->trailer().numStatusWords() );
-         ATH_MSG_DEBUG( "Da. wrd. num. : 0x" << std::ios::hex
-                        << emtau_itr->trailer().numDataWords() );
-         ATH_MSG_DEBUG( "Status pos.   : 0x" << std::ios::hex
-                        << emtau_itr->trailer().statusPosition() );
-      }
-
-      std::vector< JetEnergyResult >::const_iterator jete_itr =
-         roib_rdo->jetEnergyResult().begin();
-      std::vector< JetEnergyResult >::const_iterator jete_end =
-         roib_rdo->jetEnergyResult().end();
-      for( ; jete_itr != jete_end; ++jete_itr ) {
-
-         ATH_MSG_DEBUG( "<---- new jetenergy slink ---->" );
-         ATH_MSG_DEBUG( "Header marker : 0x" << std::ios::hex
-                        << jete_itr->header().headerMarker() );
-         ATH_MSG_DEBUG( "Header size   : 0x" << std::ios::hex
-                        << jete_itr->header().headerSize() );
-         ATH_MSG_DEBUG( "Format version: 0x" << std::ios::hex
-                        << jete_itr->header().formatVersion() );
-         ATH_MSG_DEBUG( "Source ID     : 0x" << std::ios::hex
-                        << jete_itr->header().sourceID() );
-         ATH_MSG_DEBUG( "L1 ID         : 0x" << std::ios::hex
-                        << jete_itr->header().L1ID() );
-         ATH_MSG_DEBUG( "BCID          : 0x" << std::ios::hex
-                        << jete_itr->header().BCID() );
-         ATH_MSG_DEBUG( "Trigger type  : 0x" << std::ios::hex
-                        << jete_itr->header().triggerType() );
-         ATH_MSG_DEBUG( "Event type    : 0x" << std::ios::hex
-                        << jete_itr->header().eventType() );
-
-         std::vector< JetEnergyRoI >::const_iterator roi_itr =
-            jete_itr->roIVec().begin();
-         std::vector< JetEnergyRoI >::const_iterator roi_end =
-            jete_itr->roIVec().end();
-         for( ; roi_itr != roi_end; ++roi_itr ) {
-            ATH_MSG_DEBUG( "  -> RoI = 0x" << std::ios::hex << roi_itr->roIWord() );
-         }
-
-         ATH_MSG_DEBUG( "Error status  : 0x" << std::ios::hex
-                        << jete_itr->trailer().errorStatus() );
-         ATH_MSG_DEBUG( "Status info   : 0x" << std::ios::hex
-                        << jete_itr->trailer().statusInfo() );
-         ATH_MSG_DEBUG( "St. wrd. num. : 0x" << std::ios::hex
-                        << jete_itr->trailer().numStatusWords() );
-         ATH_MSG_DEBUG( "Da. wrd. num. : 0x" << std::ios::hex
-                        << jete_itr->trailer().numDataWords() );
-         ATH_MSG_DEBUG( "Status pos.   : 0x" << std::ios::hex
-                        << jete_itr->trailer().statusPosition() );
-      }
-
-      ATH_MSG_DEBUG( "<---- new MuCTPI slink ---->" );
-      ATH_MSG_DEBUG( "Header marker : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().headerMarker() );
-      ATH_MSG_DEBUG( "Header size   : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().headerSize() );
-      ATH_MSG_DEBUG( "Format version: 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().formatVersion() );
-      ATH_MSG_DEBUG( "Source ID     : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().sourceID() );
-      ATH_MSG_DEBUG( "L1 ID         : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().L1ID() );
-      ATH_MSG_DEBUG( "BCID          : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().BCID() );
-      ATH_MSG_DEBUG( "Trigger type  : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().triggerType() );
-      ATH_MSG_DEBUG( "Event type    : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().header().eventType() );
-
-      std::vector< MuCTPIRoI >::const_iterator muctpi_itr =
-         roib_rdo->muCTPIResult().roIVec().begin();
-      std::vector< MuCTPIRoI >::const_iterator muctpi_end =
-         roib_rdo->muCTPIResult().roIVec().end();
-      for( ; muctpi_itr != muctpi_end; ++muctpi_itr ) {
-         ATH_MSG_DEBUG( "  --> RoI = 0x" << std::ios::hex << muctpi_itr->roIWord() );
-      }
-
-      ATH_MSG_DEBUG( "Error status  : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().trailer().errorStatus() );
-      ATH_MSG_DEBUG( "Status info   : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().trailer().statusInfo() );
-      ATH_MSG_DEBUG( "St. wrd. num. : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().trailer().numStatusWords() );
-      ATH_MSG_DEBUG( "Da. wrd. num. : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().trailer().numDataWords() );
-      ATH_MSG_DEBUG( "Status pos.   : 0x" << std::ios::hex
-                     << roib_rdo->muCTPIResult().trailer().statusPosition() );
-
-      // Return happily!
-      return StatusCode::SUCCESS;
-   }
-
-} // namespace ROIB
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.h b/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.h
deleted file mode 100644
index 6edd6feeb6d89267a8fb55d2880275f4617301e7..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RoIBTester.h 500598 2012-05-14 15:39:58Z krasznaa $
-#ifndef TRIGT1ROIB_ROIBTESTER_H
-#define TRIGT1ROIB_ROIBTESTER_H
-
-// STL include(s):
-#include <string>
-
-// Athena/Gaudi include(s):
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-namespace ROIB {
-
-   /**
-    *
-    *  @short Dump ROIB::RoIBResult for testing purpose
-    *
-    *         RoIBTester takes L1 RDO (ROIB::RoIBResult) from storegate
-    *         and tests/prints it.
-    *
-    *  @author Thomas Schoerner-Sadenius <thomas.schoerner@cern.ch>
-    *  @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
-    *
-    * $Revision: 500598 $
-    * $Date: 2012-05-14 17:39:58 +0200 (Mon, 14 May 2012) $
-    */
-   class RoIBTester : public AthAlgorithm {
-
-   public:
-      /// Standard Gaudi algorithm constructor
-      RoIBTester( const std::string& name, ISvcLocator* pSvcLocator );
-
-      // standard algorithm methods:
-      virtual StatusCode initialize();
-      virtual StatusCode execute();
-      virtual StatusCode finalize();
-
-   private:
-      /// property, see @link RoIBTester::RoIBTester @endlink
-      std::string m_roibRDOLocation;
-
-   }; // class RoIBTester
-
-} // namespace ROIB
-
-#endif // TRIGT1ROIB_ROIBTESTER_H
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/components/TrigT1RoIB_entries.cxx b/Trigger/TrigT1/TrigT1RoIB/src/components/TrigT1RoIB_entries.cxx
index 5ae0ad086b25b94e4c5263c4ccfc7d99b32baad1..90e541ce8dad9184bf9e75fcb11a28bf49d83bd6 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/components/TrigT1RoIB_entries.cxx
+++ b/Trigger/TrigT1/TrigT1RoIB/src/components/TrigT1RoIB_entries.cxx
@@ -1,8 +1,3 @@
 #include "../RoIBuilder.h"
-#include "../RoIBTester.h"
-#include "../RecRoIBTester.h"
 
 DECLARE_COMPONENT( ROIB::RoIBuilder )
-DECLARE_COMPONENT( ROIB::RoIBTester )
-DECLARE_COMPONENT( ROIB::RecRoIBTester )
-