diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryToolSetup.py b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryToolSetup.py
index 4094ad6eee463d55c370765eecdf74e0db45e8c5..b3fbbe5e864d5f47a9b01b57de3d8f5d1917dca7 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryToolSetup.py
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryToolSetup.py
@@ -78,13 +78,8 @@ class PixelConditionsSummaryToolSetup:
         from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelTDAQCondAlg
         condSeq += PixelTDAQCondAlg(name="PixelTDAQCondAlg", ReadKey=PixelTDAQFolder)
 
+    PixelDeadMapFolder = "/PIXEL/PixMapOverlay"
     if (self.useDeadMap):
-      PixelDeadMapFolder = "/PIXEL/PixMapOverlay"
-      PixelDeadMapInstance = "PIXEL_OFL"
-
-      if not conddb.folderRequested(PixelDeadMapFolder):
-        conddb.addFolder(PixelDeadMapInstance, PixelDeadMapFolder, className="CondAttrListCollection")
-
       if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
         conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay","/PIXEL/PixMapOverlay", className='CondAttrListCollection')
 
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index ef043d6801ff0feb932f8d9f153b89667eb7ad51..4cb832a1e9b43c3506346b9bf0cb5a134a437426 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -86,9 +86,10 @@ if DetFlags.haveRIO.pixel_on():
                 conddb.addFolder("PIXEL_OFL","/PIXEL/PixdEdx")
             else:
                 conddb.addFolder("PIXEL_OFL","/PIXEL/PixdEdx")
+                
+        if not conddb.folderRequested("/PIXEL/PixReco"):
+            conddb.addFolder("PIXEL_OFL", "/PIXEL/PixReco", className="DetCondCFloat")
 
-    if not conddb.folderRequested("/PIXEL/PixReco"):
-        conddb.addFolder("PIXEL_OFL", "/PIXEL/PixReco", className="DetCondCFloat")
 
     if not hasattr(condSeq, 'PixelOfflineCalibCondAlg'):
         from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelOfflineCalibCondAlg
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
index 690e08dc747dca06fdbb0542ccbdd645ce3443a6..9da79e352da6d03da3856dd535e5127a8ee27990 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
@@ -6,9 +6,12 @@ def makeInDetAlgs( whichSignature='' ):
   #If signature specified add suffix to the algorithms
   signature =  "_" + whichSignature if whichSignature else ''
 
+
   eventAlgs = []
   viewAlgs = []
+  from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
   from InDetRecExample.InDetKeys import InDetKeys
+
   #Create IdentifiableCaches
   from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__CacheCreator
   InDetCacheCreatorTrigViews = InDet__CacheCreator(name = "InDetCacheCreatorTrigViews" + signature,
@@ -38,8 +41,7 @@ def makeInDetAlgs( whichSignature='' ):
                                                              Decoder = InDetPixelRodDecoder)
     ToolSvc += InDetPixelRawDataProviderTool
 
-    from InDetRecExample.InDetJobProperties import InDetFlags
-    if (InDetFlags.doPrintConfigurables()):
+    if (InDetTrigFlags.doPrintConfigurables()):
       print      InDetPixelRawDataProviderTool
     
     # load the PixelRawDataProvider
@@ -55,7 +57,7 @@ def makeInDetAlgs( whichSignature='' ):
     viewAlgs.append(InDetPixelRawDataProvider)
     
     
-    if (InDetFlags.doPrintConfigurables()):
+    if (InDetTrigFlags.doPrintConfigurables()):
       print          InDetPixelRawDataProvider
     
     
@@ -69,7 +71,7 @@ def makeInDetAlgs( whichSignature='' ):
     InDetSCTRawDataProviderTool = SCTRawDataProviderTool(name    = "InDetSCTRawDataProviderTool" + signature,
                                                         Decoder = InDetSCTRodDecoder)
     ToolSvc += InDetSCTRawDataProviderTool
-    if (InDetFlags.doPrintConfigurables()):
+    if (InDetTrigFlags.doPrintConfigurables()):
       print      InDetSCTRawDataProviderTool
     
     # load the SCTRawDataProvider
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index 318c2e2a9f4f9837f62bb376558a3aedb683c776..096bf0e4ce5e07897aa715516b337c1983f06150 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -34,18 +34,8 @@ allViewAlgorithms = AthSequencer(viewNodeName, Sequential=False, ModeOR=False, S
 
 
 if TriggerFlags.doID:
-  
-  from InDetRecExample.InDetJobProperties import InDetFlags
-  InDetFlags.doCaloSeededBrem = False
-  InDetFlags.InDet25nsec = True 
-  InDetFlags.doPrimaryVertex3DFinding = False 
-  InDetFlags.doPrintConfigurables = False
-  InDetFlags.doResolveBackTracks = True 
-  InDetFlags.doSiSPSeededTrackFinder = True
-  InDetFlags.doTRTPhaseCalculation = True
-  InDetFlags.doTRTSeededTrackFinder = True
-  InDetFlags.doTruth = False
-  InDetFlags.init()
+  from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
+  InDetTrigFlags.doPixelClusterSplitting = False
   
   # PixelLorentzAngleSvc and SCTLorentzAngleSvc
   include("InDetRecExample/InDetRecConditionsAccess.py")