diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
index cd18c2a590662a66c1fd03d5894ba6e27f6a6438..4a140764cf13520c8582a518c9ee9d35c2d97798 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
@@ -10,8 +10,7 @@ export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
 export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*"
-#export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
-export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True;doEmptyMenu=True;doBjetSlice=True;"
+export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
 
 # Find the regtest reference installed with the release
 export REGTESTREF=`find_data.py TrigUpgradeTest/full_menu_cf_build.ref`
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py
index 42aeda6d7c68c7ad39af6f15065fb38a61a49e11..d6fca0ae3d6b753707e98e6068e809b2740700d5 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py
@@ -15,7 +15,6 @@ ex.input = 'ttbar'
 ex.threads = 1
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
 ex.args = '-c "setMenu=\'LS2_v1\';doEmptyMenu=True;doBjetSlice=True;doWriteBS=False;doWriteRDOTrigger=True;"'
-#ex.args = '-c "setMenu=\'LS2_v1\';doEmptyMenu=True;doBjetSlice=True;doWriteBS=False;doWriteRDOTrigger=True;" -l DEBUG'
 
 test = Test.Test()
 test.art_type = 'build'
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 7be946a361b336936a3f4a8d913e75363fe01086..4b5e1c5016ebd39d34703f455c24c7849f5f74e8 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -579,10 +579,6 @@ if opt.doWriteBS:
     ConfigFlags.Trigger.writeBS = True  # new JO flag
 
 ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
-if globalflags.DataSource == 'data':
-    ConfigFlags.Input.isMC = False
-else:
-    ConfigFlags.Input.isMC = True
 # ID Cache Creators
 ConfigFlags.lock()
 from TriggerJobOpts.TriggerConfig import triggerIDCCacheCreatorsCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index 2a6df3d1356a0c71934654d7907fd71c11edcf14..1f48c44e876bc2d9e7d59c6bf539e4a1766b5074 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -48,8 +48,6 @@ def bJetStep2Sequence():
     # BJet specific
     InputMakerAlg.PlaceJetInView = True
     InputMakerAlg.InViewJets = recordable( "HLT_bJets" )
-    #
-    InputMakerAlg.ViewNodeName = "bJetBtagSequence"
 
 
     # Prepare data objects for view verifier