diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.cxx b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.cxx
index 58f9e1d58765789950d5f4bac726360e2d2e9ddb..a1ba585f0cbda3fa34173a6e7d6dc4836e2dd680 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.cxx
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.cxx
@@ -13,20 +13,10 @@ namespace LVL1MUCTPIPHASE1 {
   {
   }
   
-  MUCTPI_AthAlg::~MUCTPI_AthAlg()
-  {
-    
-  }
-
-
-
   /// Regular Gaudi algorithm initialization function
   StatusCode MUCTPI_AthAlg::initialize()
   {
-    // Init message
-    ATH_MSG_INFO( "=======================================" );
     ATH_MSG_INFO( "Initialisation for MUCTPI_AthAlg"  );
-    ATH_MSG_INFO( "=======================================" );
 
     ATH_MSG_DEBUG("retrieving " << m_muctpiTool);
     CHECK( m_muctpiTool.retrieve() );
@@ -34,22 +24,10 @@ namespace LVL1MUCTPIPHASE1 {
     return StatusCode::SUCCESS;
   }
 
-  /// Regular Gaudi algorithm finalization function
-  StatusCode MUCTPI_AthAlg::finalize()
-  {
-    ATH_MSG_DEBUG( "===============================" );
-    ATH_MSG_DEBUG( "Finalizing MUCTPI_AthAlg" );
-    ATH_MSG_DEBUG( "===============================" );
-
-    return StatusCode::SUCCESS;
-  }
-
   /// Regular Gaudi algorithm execute function
   StatusCode MUCTPI_AthAlg::execute(const EventContext& /*eventContext*/) const
   {
-    ATH_MSG_DEBUG( "===============================" );
     ATH_MSG_DEBUG( "Executing MUCTPI_AthAlg" );
-    ATH_MSG_DEBUG( "===============================" );
 
     CHECK( m_muctpiTool->execute() );
 
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.h b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.h
index ac657200b8ca5a6b2d8fa6c4e85ea3ea1e362668..36cc9e680b6d5c22185ce83c3119a28157427ab9 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.h
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthAlg.h
@@ -1,5 +1,5 @@
 /*                                                                                                                      
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration                                               
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 // This file is really -*- C++ -*-.
@@ -20,24 +20,21 @@ namespace LVL1MUCTPI {
 }
 namespace LVL1MUCTPIPHASE1 {
 
-  class MUCTPI_AthTool;
-
   class MUCTPI_AthAlg : public AthReentrantAlgorithm
   {
     
   public:
     
     MUCTPI_AthAlg( const std::string& name, ISvcLocator* pSvcLocator );
-    virtual ~MUCTPI_AthAlg();
-    
 
     /// Regular Gaudi algorithm initialization function
     virtual StatusCode initialize() override;
-    /// Regular Gaudi algorithm finalization function
-    virtual StatusCode finalize() override;
     /// Regular Gaudi algorithm execute function
     virtual StatusCode execute(const EventContext& eventContext) const override;
-    
+
+    // Delete this once the algorithm has been made thread-safe (ATR-23540):
+    virtual bool isReEntrant() const override final { return false; }
+
   private:
     
     ToolHandle<LVL1MUCTPI::IMuctpiSimTool> m_muctpiTool{this, "MUCTPI_AthTool", "LVL1MUCTPIPHASE1::MUCTPI_AthTool/MUCTPI_AthTool", "Tool to steer the MUCTPI simulation"};