diff --git a/Simulation/Digitization/share/LVL1Digitization.py b/Simulation/Digitization/share/LVL1Digitization.py
index d2339a0f595b17db2b24ca0f23eab8557ba5c79d..c68965920a4240bfc374127cc6a6d07c27e4bc27 100755
--- a/Simulation/Digitization/share/LVL1Digitization.py
+++ b/Simulation/Digitization/share/LVL1Digitization.py
@@ -114,12 +114,8 @@ if DetFlags.digitize.LVL1_on():
     #--------------------------------------------------------------
     if DetFlags.simulateLVL1.RPC_on() or DetFlags.simulateLVL1.TGC_on():
         from AthenaConfiguration.AllConfigFlags import ConfigFlags
-        if ConfigFlags.Trigger.enableL1MuonPhase1:
-            from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1
-            topSequence += L1MuctpiPhase1()
-        else:
-            from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
-            topSequence += L1Muctpi()
+        from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1
+        topSequence += L1MuctpiPhase1()
 
     #-------------------------------------------------------
     # TrigT1CaloSim Algos
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py b/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py
index e9e01bbf5f64adc46adcabc6e1021b166b123165..6ab4dd5e94862700918186a9d2d5d9560ae3e206 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py
@@ -26,32 +26,20 @@ def L1LegacyTopoSimulationCfg(flags):
     acc = ComponentAccumulator()
     
     #Grab the MUCTPI tool
-    if flags.Trigger.enableL1MuonPhase1:
-        from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import MUCTPI_AthToolCfg
-        muctpiTool = MUCTPI_AthToolCfg("MUCTPI_AthTool")
-        acc.addPublicTool(muctpiTool, primary=True)
-    else:
-        from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiToolRDOCfg
-        muctpiToolAcc = L1MuctpiToolRDOCfg(flags)
-        muctpiTool = muctpiToolAcc.getPrimary()
-        acc.merge(muctpiToolAcc)
+    from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import MUCTPI_AthToolCfg
+    muctpiTool = MUCTPI_AthToolCfg("MUCTPI_AthTool")
+    acc.addPublicTool(muctpiTool, primary=True)
 
     #Configure the MuonInputProvider
-    if flags.Trigger.enableL1MuonPhase1:
-        muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider", 
-                                                        ROIBResultLocation = "", #disable input from RoIBResult
-                                                        MuonROILocation = "",
-                                                        MuonEncoding = 1)
-    else:
-        muProvider = CompFactory.LVL1.MuonInputProviderLegacy("MuonInputProviderLegacy", 
-                                                              ROIBResultLocation = "", #disable input from RoIBResult
-                                                              MuctpiSimTool = muctpiTool,
-                                                              MuonEncoding = 1 if flags.Input.isMC else 0)
+    muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider",
+                                                    ROIBResultLocation = "", #disable input from RoIBResult
+                                                    MuonROILocation = "",
+                                                    MuonEncoding = 1)
 
     #Configure the MuonRoiTools for the MIP
     from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3RPCRecRoiTool, getRun3TGCRecRoiTool
-    muProvider.RecRpcRoiTool = getRun3RPCRecRoiTool("RPCRecRoiTool", useRun3Config = flags.Trigger.enableL1MuonPhase1)
-    muProvider.RecTgcRoiTool = getRun3TGCRecRoiTool("TGCRecRoiTool", useRun3Config = flags.Trigger.enableL1MuonPhase1)
+    muProvider.RecRpcRoiTool = getRun3RPCRecRoiTool("RPCRecRoiTool", useRun3Config = True)
+    muProvider.RecTgcRoiTool = getRun3TGCRecRoiTool("TGCRecRoiTool", useRun3Config = True)
 
     emtauProvider = CompFactory.LVL1.EMTauInputProvider("EMTauInputProvider")
 
@@ -70,27 +58,15 @@ def L1TopoSimulationCfg(flags):
     acc = ComponentAccumulator()
 
     #Configure the MuonInputProvider
-    if flags.Trigger.enableL1MuonPhase1:
-        muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider", 
-                                                        ROIBResultLocation = "", #disable input from RoIBResult
-                                                        MuonROILocation = "",
-                                                        MuonEncoding = 1)
-    else:
-        #Grab the MUCTPI tool
-        from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiToolRDOCfg
-        muctpiToolAcc = L1MuctpiToolRDOCfg(flags)
-        muctpiTool = muctpiToolAcc.getPrimary()
-        acc.merge(muctpiToolAcc)
-
-        muProvider = CompFactory.LVL1.MuonInputProviderLegacy("MuonInputProviderLegacy", 
-                                                              ROIBResultLocation = "", #disable input from RoIBResult
-                                                              MuctpiSimTool = muctpiTool,
-                                                              MuonEncoding = 1 if flags.Input.isMC else 0)
+    muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider",
+                                                    ROIBResultLocation = "", #disable input from RoIBResult
+                                                    MuonROILocation = "",
+                                                    MuonEncoding = 1)
 
     #Configure the MuonRoiTools for the MIP
     from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3RPCRecRoiTool, getRun3TGCRecRoiTool
-    muProvider.RecRpcRoiTool = getRun3RPCRecRoiTool("RPCRecRoiTool", useRun3Config = flags.Trigger.enableL1MuonPhase1)
-    muProvider.RecTgcRoiTool = getRun3TGCRecRoiTool("TGCRecRoiTool", useRun3Config = flags.Trigger.enableL1MuonPhase1)
+    muProvider.RecRpcRoiTool = getRun3RPCRecRoiTool("RPCRecRoiTool", useRun3Config = True)
+    muProvider.RecTgcRoiTool = getRun3TGCRecRoiTool("TGCRecRoiTool", useRun3Config = True)
 
     emtauProvider = CompFactory.LVL1.EMTauInputProviderFEX("EMTauInputProviderFEX")
 
@@ -121,30 +97,10 @@ def L1TopoSimulationOldStyleCfg(flags, isLegacy):
         # TODO: the legacy simulation should not need to deal with muon inputs
         topoSimSeq.MuonInputProvider.ROIBResultLocation = "" #disable input from RoIBResult
 
-    if flags.Trigger.enableL1MuonPhase1: 
-        from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3RPCRecRoiTool, getRun3TGCRecRoiTool
-        topoSimSeq.MuonInputProvider.RecRpcRoiTool = getRun3RPCRecRoiTool(useRun3Config=True)
-        topoSimSeq.MuonInputProvider.RecTgcRoiTool = getRun3TGCRecRoiTool(useRun3Config=True)
-        topoSimSeq.MuonInputProvider.MuonROILocation = ""
-        topoSimSeq.MuonInputProvider.MuonEncoding = 1
-    else:
-        from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-        from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
-        ToolSvc += L1MuctpiTool("L1MuctpiTool")
-        ToolSvc.L1MuctpiTool.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
-        ToolSvc.MuonInputProviderLegacy.MuctpiSimTool = ToolSvc.L1MuctpiTool
-        ToolSvc.MuonInputProviderLegacy.locationMuCTPItoL1Topo = ""
-        if not flags.Trigger.doLVL1:
-            ToolSvc.MuonInputProviderLegacy.MuonROILocation = ""
-        # enable the reduced (coarse) granularity topo simulation
-        # currently only for MC
-        # apparently not needed for phase1
-        if not flags.Input.isMC:
-            ToolSvc.MuonInputProviderLegacy.MuonEncoding = 1
-        else:
-            ToolSvc.MuonInputProviderLegacy.MuonEncoding = 0
-
-    if not flags.Trigger.enableL1MuonPhase1:
-        topoSimSeq.MuonInputProvider = ToolSvc.MuonInputProviderLegacy
+    from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3RPCRecRoiTool, getRun3TGCRecRoiTool
+    topoSimSeq.MuonInputProvider.RecRpcRoiTool = getRun3RPCRecRoiTool(useRun3Config=True)
+    topoSimSeq.MuonInputProvider.RecTgcRoiTool = getRun3TGCRecRoiTool(useRun3Config=True)
+    topoSimSeq.MuonInputProvider.MuonROILocation = ""
+    topoSimSeq.MuonInputProvider.MuonEncoding = 1
 
     return topoSimSeq
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
index d7a2a47c02f0013d3e21ca5ea8dcee7510008a7a..bae11c6e370aa68e24f7d20efaab33e77d8cb571 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
@@ -188,12 +188,8 @@ else:
         from AthenaCommon.AlgSequence import AthSequencer
         CTPMonSeq=CfgMgr.AthSequencer('CTPMonSeq')
 
-        if ConfigFlags.Trigger.enableL1MuonPhase1:
-            from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1_on_Data
-            CTPMonSeq += L1MuctpiPhase1_on_Data()
-        else:
-            from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi_on_Data
-            CTPMonSeq += L1Muctpi_on_Data()
+        from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1_on_Data
+        CTPMonSeq += L1MuctpiPhase1_on_Data()
 
         from TrigT1CTMonitoring.TrigT1CTMonitoringConf import TrigT1CTMonitoring__DeriveSimulationInputs as DeriveSimulationInputs
         CTPMonSeq += DeriveSimulationInputs(do_MuCTPI_input=True,
diff --git a/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py b/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py
index 52c58bed1e25b8a80466ed656085a1fe6d3ebc3a..8292367ce9ce2ed72bfad36e5884198c9a3e2965 100644
--- a/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py
@@ -22,10 +22,10 @@ def CTPSimulationCfg(flags):
                                                         LegacyTopoInput = "L1TopoLegacyToCTPLocation"
                                                         ))
     log.info("Not all part of CTP simulation are enabled yet")
-    if flags.Trigger.enableL1CaloLegacy or not flags.Trigger.enableL1MuonPhase1:
+    if flags.Trigger.enableL1CaloLegacy:
         roib = CompFactory.ROIB.RoIBuilder("RoIBuilder",
                                             DoCalo = flags.Trigger.enableL1CaloLegacy,
-                                            DoMuon = not flags.Trigger.enableL1MuonPhase1)
+                                            DoMuon = False)   # not needed for L1MuonPhase1
         acc.addEventAlgo(roib)
 
 
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfigOldStyle.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfigOldStyle.py
index 704f02f6d00a7eed57d8beeeb006fe633e9808f7..b3a5478c365b93ef9b62d1537d41e789cdc46989 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfigOldStyle.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfigOldStyle.py
@@ -171,35 +171,19 @@ def TGCTriggerConfig(flags):
     tgc = CompFactory.LVL1TGCTrigger__LVL1TGCTrigger("LVL1TGCTrigger",
                                                      InputData_perEvent  = "TGC_DIGITS_L1",
                                                      MaskFileName12      = "" if MuonGeometryFlags.hasSTGC() or MuonGeometryFlags.hasMM() else "TrigT1TGCMaskedChannel._12.db",
-                                                     useRun3Config = flags.Trigger.enableL1MuonPhase1,
+                                                     useRun3Config = True,
                                                      TileMuRcv_Input = tmdbInput )
     from IOVDbSvc.CondDB import conddb
     from AthenaCommon.AlgSequence import AthSequencer
     condSeq = AthSequencer("AthCondSeq")
-    if flags.Trigger.enableL1MuonPhase1:
-        if flags.Trigger.L1MuonSim.EmulateNSWA or flags.Trigger.L1MuonSim.EmulateNSWC:
-            tgc.MuctpiPhase1LocationTGC = "L1MuctpiStoreTGCint"
-        tgc.TILEMU = True
-        condSeq += CompFactory.TGCTriggerCondAlg()
-        from PathResolver import PathResolver
-        bwCW_Run3_filePath=PathResolver.FindCalibFile("TrigT1TGC_CW/BW/CW_BW_Run3.v01.db")
-        conddb.blockFolder("/TGC/TRIGGER/CW_BW_RUN3")
-        conddb.addFolder(bwCW_Run3_filePath,"/TGC/TRIGGER/CW_BW_RUN3 <tag>TgcTriggerCwBwRun3-01</tag>",forceMC=True,force=True, className='CondAttrListCollection')
-    else:
-        condSeq += CompFactory.TGCTriggerDbAlg()
-        if not flags.Input.isMC:
-            conddbNameOffline = flags.Trigger.L1MuonSim.CondDBOffline if flags.Trigger.L1MuonSim.CondDBOffline != '' else "OFLCOND-MC16-SDR-RUN2-04"
-            conddb._SetAcc('TGC_OFL','COOLOFL_TGC')
-            conddb.blockFolder("/TGC/TRIGGER/CW_EIFI")
-            conddb.blockFolder("/TGC/TRIGGER/CW_BW")
-            conddb.blockFolder("/TGC/TRIGGER/CW_TILE")
-            conddb.addFolderWithTag("TGC_OFL","/TGC/TRIGGER/CW_EIFI",conddbNameOffline,forceMC=True,force=True,className="CondAttrListCollection")
-            conddb.addFolderWithTag("TGC_OFL","/TGC/TRIGGER/CW_BW",conddbNameOffline,forceMC=True,force=True,className="CondAttrListCollection")
-            conddb.addFolderWithTag("TGC_OFL","/TGC/TRIGGER/CW_TILE",conddbNameOffline,forceMC=True,force=True,className="CondAttrListCollection")
-        else:
-            conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_EIFI", className="CondAttrListCollection")
-            conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_BW", className="CondAttrListCollection")
-            conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_TILE", className="CondAttrListCollection")
+    if flags.Trigger.L1MuonSim.EmulateNSWA or flags.Trigger.L1MuonSim.EmulateNSWC:
+        tgc.MuctpiPhase1LocationTGC = "L1MuctpiStoreTGCint"
+    tgc.TILEMU = True
+    condSeq += CompFactory.TGCTriggerCondAlg()
+    from PathResolver import PathResolver
+    bwCW_Run3_filePath=PathResolver.FindCalibFile("TrigT1TGC_CW/BW/CW_BW_Run3.v01.db")
+    conddb.blockFolder("/TGC/TRIGGER/CW_BW_RUN3")
+    conddb.addFolder(bwCW_Run3_filePath,"/TGC/TRIGGER/CW_BW_RUN3 <tag>TgcTriggerCwBwRun3-01</tag>",forceMC=True,force=True, className='CondAttrListCollection')
 
     return tgc
 
@@ -218,7 +202,7 @@ def Lvl1EndcapMuonSequence(flags):
     tmdb = TMDBSimulationSequence(flags)
     tgc = TGCTriggerConfig(flags)
     from AthenaCommon.CFElements import seqAND
-    if flags.Trigger.enableL1MuonPhase1 and ( flags.Trigger.L1MuonSim.EmulateNSWA or flags.Trigger.L1MuonSim.EmulateNSWC ):
+    if flags.Trigger.L1MuonSim.EmulateNSWA or flags.Trigger.L1MuonSim.EmulateNSWC:
         rdo2prd = MuonRdo2PrdSequence(flags)
         recoSegment = RecoMuonSegmentSequence(flags)
         tgcmod = TGCModifierConfig(flags)
@@ -234,7 +218,7 @@ def Lvl1BarrelMuonSequence(flags):
                                 RPCbytestream     = False,
                                 RPCbytestreamFile = "",
                                 RPCDigitContainer = "RPC_DIGITS_L1",
-                                useRun3Config = flags.Trigger.enableL1MuonPhase1 )
+                                useRun3Config = True )
 
     # trigger roads setting is configured in either MuonCnvExample.MuonCablingConfig or MuonConfig.MuonCablingConfig
 
@@ -243,30 +227,21 @@ def Lvl1BarrelMuonSequence(flags):
     return l1MuBarrelSim
 
 def Lvl1MuctpiConfig(flags):
-    if flags.Trigger.enableL1MuonPhase1:
-        rpcRecRoiTool = CompFactory.LVL1__TrigT1RPCRecRoiTool("TrigT1RPCRecRoiTool", UseRun3Config=True)
-        tgcRecRoiTool = CompFactory.LVL1__TrigT1TGCRecRoiTool("TrigT1TGCRecRoiTool", UseRun3Config=True)
-        muctpiTool = CompFactory.LVL1MUCTPIPHASE1__MUCTPI_AthTool(name="MUCTPI_AthTool")
-        muctpiTool.MuCTPICTPLocation = 'L1MuCTPItoCTPLocation'
-        muctpiTool.OverlapStrategyName = 'LUT'
-        muctpiTool.LUTXMLFile = 'TrigConfMuctpi/overlapRun3_20201214.xml'
-        muctpiTool.InputSource = 'DIGITIZATION'
-        muctpiTool.RPCRecRoiTool = rpcRecRoiTool
-        muctpiTool.TGCRecRoiTool = tgcRecRoiTool
-        muctpiTool.TrigThresholdDecisionTool = CompFactory.LVL1__TrigThresholdDecisionTool(name="TrigThresholdDecisionTool")
-        muctpiTool.TrigThresholdDecisionTool.RPCRecRoiTool = rpcRecRoiTool
-        muctpiTool.TrigThresholdDecisionTool.TGCRecRoiTool = tgcRecRoiTool
-        muctpi = CompFactory.LVL1MUCTPIPHASE1__MUCTPI_AthAlg(name="MUCTPI_AthAlg",
-                                                             MUCTPI_AthTool = muctpiTool)
-        return muctpi
-    else:
-        from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-        from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
-        muctpi = L1Muctpi()
-        muctpi.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
-        if not flags.Input.isMC:
-            muctpi.RDOOutputLocID = 'rerunMUCTPI_RDO'
-        return muctpi
+    rpcRecRoiTool = CompFactory.LVL1__TrigT1RPCRecRoiTool("TrigT1RPCRecRoiTool", UseRun3Config=True)
+    tgcRecRoiTool = CompFactory.LVL1__TrigT1TGCRecRoiTool("TrigT1TGCRecRoiTool", UseRun3Config=True)
+    muctpiTool = CompFactory.LVL1MUCTPIPHASE1__MUCTPI_AthTool(name="MUCTPI_AthTool")
+    muctpiTool.MuCTPICTPLocation = 'L1MuCTPItoCTPLocation'
+    muctpiTool.OverlapStrategyName = 'LUT'
+    muctpiTool.LUTXMLFile = 'TrigConfMuctpi/overlapRun3_20201214.xml'
+    muctpiTool.InputSource = 'DIGITIZATION'
+    muctpiTool.RPCRecRoiTool = rpcRecRoiTool
+    muctpiTool.TGCRecRoiTool = tgcRecRoiTool
+    muctpiTool.TrigThresholdDecisionTool = CompFactory.LVL1__TrigThresholdDecisionTool(name="TrigThresholdDecisionTool")
+    muctpiTool.TrigThresholdDecisionTool.RPCRecRoiTool = rpcRecRoiTool
+    muctpiTool.TrigThresholdDecisionTool.TGCRecRoiTool = tgcRecRoiTool
+    muctpi = CompFactory.LVL1MUCTPIPHASE1__MUCTPI_AthAlg(name="MUCTPI_AthAlg",
+                                                         MUCTPI_AthTool = muctpiTool)
+    return muctpi
 
 def Lvl1MuonSimulationSequence(flags):
     rdo2digit = Lvl1MuRdo2Digit(flags)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
index 749107c862d74a183d7bc73cc8f258f06cefc584..27715cb562cb36b05003d458e076763bab749a07 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -16,6 +16,10 @@ def Lvl1SimulationSequence( ConfigFlags ):
 
     log = logging.getLogger('TriggerJobOpts.Lvl1SimulationConfig')
 
+    if ConfigFlags.Trigger.L1.doMuon and not ConfigFlags.Trigger.enableL1MuonPhase1:
+        raise RuntimeError('The Run-1&2 L1Muon simulation is only supported in release<=21. '
+                           'Please set Trigger.enableL1MuonPhase1=True.')
+
     if not ConfigFlags.Input.isMC:
         from AthenaCommon.DetFlags import DetFlags
         DetFlags.detdescr.ALFA_setOff()
@@ -140,8 +144,6 @@ def Lvl1SimulationSequence( ConfigFlags ):
         if ConfigFlags.Trigger.enableL1CaloLegacy:
             isL1TopoLegacyOutputProvided = True
         isL1TopoOutputProvided = True
-        if ConfigFlags.Trigger.enableL1MuonPhase1 or ConfigFlags.Trigger.enableL1CaloPhase1:
-            isL1TopoOutputProvided = True
 
     if ConfigFlags.Trigger.L1.doCTP:
         from TrigT1CTP.TrigT1CTPConfig import CTPSimulationInReco
@@ -161,8 +163,7 @@ def Lvl1SimulationSequence( ConfigFlags ):
             ctp.LegacyTopoInput = ""
         if not isL1TopoOutputProvided:
             ctp.TopoInput = ""
-        if not ConfigFlags.Trigger.enableL1MuonPhase1: # Run 2 simulation of MUCTPI sends a slightly different format to the CTP
-            ctp.MuonMultiplicityRun2Format = True
+
         ctp.jFexJetInput = ""
         ctp.jFexLJetInput = ""
         ctp.gFexJetInput = ""
@@ -173,11 +174,11 @@ def Lvl1SimulationSequence( ConfigFlags ):
         ctp.eFexTauInput = ""
         ctpSimSeq = seqAND("CTPSimSeq", [ctp])
 
-        if ConfigFlags.Trigger.enableL1CaloLegacy or not ConfigFlags.Trigger.enableL1MuonPhase1:
+        if ConfigFlags.Trigger.enableL1CaloLegacy:
             from TrigT1RoIB.TrigT1RoIBConfig import RoIBuilder
             roib = RoIBuilder("RoIBuilder")
             roib.DoCalo = ConfigFlags.Trigger.enableL1CaloLegacy
-            roib.DoMuon = not ConfigFlags.Trigger.enableL1MuonPhase1
+            roib.DoMuon = False    # not needed for L1MuonPhase1
             ctpSimSeq += [roib]
 
     ##################################################
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 62f9d7e2bb061e5fde7cc2222e8973a3e1c63b4b..d7aa39bbe2d0fe13474f9f0a75b7bac64eeec79f 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -25,7 +25,7 @@ def createTriggerFlags():
     # changes decoding of L1 so that allways all configured chains are enabled, testing mode
     flags.addFlag("Trigger.HLTSeeding.forceEnableAllChains", False)
 
-    # Enable Run-3 LVL1 muon simulation and/or decoding
+    # Enable Run-3 LVL1 muon decoding
     flags.addFlag('Trigger.enableL1MuonPhase1', False)
 
     # Enable Run-3 LVL1 calo simulation and/or decoding