diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
index 9f5b664e1682de243aa9413922b62707db3c193e..51194796060552be9ae40720346b1174cc19d08b 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
@@ -39,7 +39,7 @@ from IOVDbMetaDataTools.IOVDbMetaDataToolsConf import IOVDbMetaDataTool
 ToolSvc += IOVDbMetaDataTool( "IOVDbMetaDataTool" )
 # IOVDbMetaDataTool.OutputLevel      = DEBUG
 
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataContainer = "MetaDataHdr"
 svcMgr.MetaDataSvc.MetaDataTools += [ "IOVDbMetaDataTool" ]
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py b/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py
index cf2fa25b80c00448ae3a1177c90f11bc4a99225a..1104205ccb61b5f5bd0a1482cd7c65f4dd385b1b 100644
--- a/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py
@@ -28,7 +28,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
 LumiBlockMetaDataTool.calcLumi = True # False by default
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py b/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py
index c926b28dd6af5c69004d907f3ce7a90b0676ef44..8c74f2c5190e5a2be77f68bfd05403e4cafe1be2 100644
--- a/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py
+++ b/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py
@@ -4,7 +4,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
 LumiBlockMetaDataTool.calcLumi = True # False by default
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py b/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py
index 9f4827b6cc8b81806cb4e153630da52ce0cd32d1..c524e1df49b38cd76bc891426bfbadd126c123d7 100644
--- a/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py
+++ b/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py
@@ -4,7 +4,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
 LumiBlockMetaDataTool.calcLumi = True # False by default
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/python/RedirectMetaDataSvc.py b/Database/AthenaPOOL/EventSelectorAthenaPool/python/RedirectMetaDataSvc.py
deleted file mode 100755
index 5b0fc2d75c8c652bf23369670c9a6387d8dfe1c4..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/python/RedirectMetaDataSvc.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @file RedirectMetaDataSvc.py
-# @brief temporary backward compatibility hack
-# @details This hack allows to keep backward compatibility for statements like
-# @code
-# from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
-# @endcode
-
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import *
-import AthenaServices.AthenaServicesConf
-MetaDataSvc = AthenaServices.AthenaServicesConf.MetaDataSvc
-#FIXME print a warning when MetaDataSvc is used
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py b/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py
old mode 100755
new mode 100644
index fcdd7c52952690f75736aa9fe5f3388a03980afa..74583d364ec2ca794156596c7254d9b234a940c6
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py
@@ -1,17 +1,2 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-## @file: EventSelectorAthenaPool/python/__init__.py
-# @author: Peter van Gemmeren (gemmeren@anl.gov) (copied from WL in StoreGate)
-
-__version__ = '1.0.0'
-__author__  = 'Peter van Gemmeren (gemmeren@anl.gov)'
-
-__all__ = [ 'Bindings' ]
-
-# FIXME replace the autogenerated configurable repository with a hand-hacked one.
-# FIXME This allows to keep backward compatibility for statements like
-# from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
-
-import sys
-import EventSelectorAthenaPool.RedirectMetaDataSvc
-sys.modules[ "EventSelectorAthenaPool.EventSelectorAthenaPoolConf" ] = sys.modules[ "EventSelectorAthenaPool.RedirectMetaDataSvc" ]
diff --git a/Event/EventBookkeeperTools/python/CutFlowHelpers.py b/Event/EventBookkeeperTools/python/CutFlowHelpers.py
index 18afb4fdf39dc4e544d3a903672a5c557fba6639..8c7a8b36117e3f8ae40be562072a14fa2c3c0180 100644
--- a/Event/EventBookkeeperTools/python/CutFlowHelpers.py
+++ b/Event/EventBookkeeperTools/python/CutFlowHelpers.py
@@ -68,7 +68,7 @@ def CreateCutFlowSvc( svcName="CutFlowSvc", athFile=None, seq=None, addAlgInPlac
 
     # Make sure MetaDataSvc is ready
     if not hasattr(svcMgr,'MetaDataSvc'):
-      from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+      from AthenaServices.AthenaServicesConf import MetaDataSvc
       svcMgr += MetaDataSvc( "MetaDataSvc" )
 
     # Add BookkeeperTools
@@ -159,7 +159,7 @@ def CreateBookkeeperTool( name="CutBookkeepers" ):
 
   # Make sure MetaDataSvc is ready
   if not hasattr(svcMgr,'MetaDataSvc'):
-    from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+    from AthenaServices.AthenaServicesConf import MetaDataSvc
     svcMgr += MetaDataSvc( "MetaDataSvc" )
 
   # Add BookkeeperTools
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py
index d7e366f81271c6253d4e66791f2d6356324b5f19..d9f86881e3157f5cf06a333ffd742fd5dbaaff1b 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py
@@ -112,22 +112,7 @@ if DetFlags.overlay.LVL1_on():
                            "DataVector<LVL1::JEMEtSums>#*",
                            "LVL1::CMMRoI#*"]
 
-#options for writing the MetaData into the output file
-MetaDataStore=ServiceMgr.MetaDataStore
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-StreamRDO_MC_FH =  AthenaPoolOutputStream( "StreamRDO_MC_FH" )
-from AthenaCommon.AthenaCommonFlags import jobproperties
-StreamRDO_MC_FH.OutputFile = "ROOTTREE:"+SignalCollection
-StreamRDO_MC_FH.Store = MetaDataStore
-StreamRDO_MC_FH.WriteOnExecute = False
-StreamRDO_MC_FH.WriteOnFinalize = True
 # Write all IOV meta data containers
-StreamRDO_MC_FH.ItemList += [ "IOVMetaDataContainer#*" ]
-StreamRDO_MC_FH.ItemList += [ "LumiBlockCollection#*" ]
-
-from OutputStreamAthenaPool.OutputStreamAthenaPoolConf import AthenaPoolOutputStreamTool
-StreamRDO_MC_FHTool = AthenaPoolOutputStreamTool("StreamRDO_MC_FHTool")
-StreamRDO_MC_FHTool.OutputCollection = "MetaDataHdr";
-StreamRDO_MC_FHTool.PoolContainerPrefix = "MetaData"
-StreamRDO_MC_FH.WritingTool = StreamRDO_MC_FHTool
+StreamRDO_MC.MetadataItemList += [ "IOVMetaDataContainer#*" ]
+StreamRDO_MC.MetadataItemList += [ "LumiBlockCollection#*" ]
 
diff --git a/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py b/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
old mode 100755
new mode 100644
index 94300afaaaf595de2436b2b3790794e74ac20b31..d10de9385ccdf24b39ae36bae60206c0335cd7a8
--- a/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
+++ b/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
@@ -118,7 +118,7 @@ theApp.ExtSvc += [ "ByteStreamCnvSvc"]
 
 # It looks as if one needs this now online ?
 if False:
-    from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+    from AthenaServices.AthenaServicesConf import MetaDataSvc
     svcMgr += MetaDataSvc( "MetaDataSvc" )
     # Add in MetaData Stores
     from StoreGate.StoreGateConf import StoreGateSvc
diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py
index f669c6c189b2daaab709b2fa9e124fbea293d2f7..135bf3bb56c0a620fb6d3f40c1581330d1aeff8b 100644
--- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py
+++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py
@@ -47,7 +47,6 @@ if 'zRange' in jobConfig:
     FilterUtils.filterSeq += FilterUtils.ZFilter(jobConfig['zRange'])
 
 topSequence.StreamAOD.OutputFile = jobConfig['outputfile']
-#topSequence.StreamAOD_FH.OutputFile = jobConfig['outputfile']
 
 # Reduce verbosity
 theApp.setOutputLevel = jobConfig['outputlevel']
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
index cae154921c5f2eb8f0e3edb7764bd28403011a59..8ba81279206bdd417933522524bf76768ea4257a 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
@@ -244,7 +244,7 @@ if  addLumiBlockTools :
     LumiBlockMetaDataTool.OutputLevel = INFO
 
     # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-    from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+    from AthenaServices.AthenaServicesConf import MetaDataSvc
     svcMgr += MetaDataSvc( "MetaDataSvc" )
     svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
index a731e61dddca36141c0ad9d74b85ea4a9ab067a1..8b27b0e349186e84173b6ddced2d62246cb639c2 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
@@ -218,7 +218,7 @@ if goodRunList!='' and 'goodRunListArray' in dir() and goodRunListArray!='':
     LumiBlockMetaDataTool.OutputLevel = INFO
 
     # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-    from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+    from AthenaServices.AthenaServicesConf import MetaDataSvc
     svcMgr += MetaDataSvc( "MetaDataSvc" )
     svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py
index 2f007381973c34c2671bd58e7fefba32df343afc..1ca8448062adc0b5a52fb90bc55af7fc923e7f2e 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py
@@ -6,7 +6,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
 LumiBlockMetaDataTool.calcLumi = True # False by default
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
index 9fa692a77b111f746e0655ff8529e785a38bf8b5..e631cfc846dcfb8c0147a0138e8b88cc6e78c384 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
@@ -111,7 +111,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
 LumiBlockMetaDataTool.calcLumi = True # False by default
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
index 38c99ce343fececad79c4132a1ba4aab9db7572b..e8a2b27baa05fd8c69074ca30ba097f804237b78 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
@@ -111,7 +111,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
 LumiBlockMetaDataTool.calcLumi = True # False by default
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py
old mode 100755
new mode 100644
index 66447c8f475344b8ecbafbb7557a092934eb672b..77334363b094b2bf8d1fc12e883e429a19d6eaac
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py
@@ -51,7 +51,7 @@ if do_grl and sample == 'data':
     ToolSvc += theLumiBlockMetaDataTool
     
     # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-    from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+    from AthenaServices.AthenaServicesConf import MetaDataSvc
     theMetaDataSvc = MetaDataSvc( "MetaDataSvc" )
     theMetaDataSvc.MetaDataTools += [ theLumiBlockMetaDataTool ]
     svcMgr += theMetaDataSvc
diff --git a/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py b/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py
index c80e40ece134de8918a868656bfceb0218e558da..b6a113c550fa245ff7bb11471007f7d65201cb35 100644
--- a/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py
+++ b/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py
@@ -124,7 +124,7 @@ theApp.EvtSel = "EventSelector"
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
 StreamESD=AthenaPoolOutputStream("StreamESD",athenaCommonFlags.PoolESDOutput(),True)
 StreamESD.ForceRead = True
-# Put MetaData in ESD stream via StreamESD_FH.
+# Put MetaData in ESD stream
 StreamESD.MetadataItemList += [ "LumiBlockCollection#*" ]
 
 include ("EventAthenaPool/EventAthenaPoolItemList_joboptions.py")
diff --git a/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py b/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py
index ae9548c90ef64bed4aa4483cdc01c288e0cf7ddf..bdb086dcea6ffed2ff46c0854a8d49efbdfee624 100644
--- a/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py
+++ b/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py
@@ -52,8 +52,7 @@ class DefaultShapeDumper(LArShapeDumper) :
     if doStream :
       from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
       StreamLArSamples = AthenaPoolOutputStream('StreamLArSamples', 'LArSamples.root', True)
-      topSequence.StreamLArSamples.ItemList += ['LArSamplesContainer#Samples']
-      topSequence.StreamLArSamples_FH.ItemList += ['LArSamplesContainer#Samples']
+      topSequence.StreamLArSamples.MetadataItemList += ['LArSamplesContainer#Samples']
       StreamLArSamples.WriteOnExecute = False
       StreamLArSamples.WriteOnFinalize = True
     else :
diff --git a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py
index fc6a3c5006553195264fb3d9f90d2a2c4d5b340c..c62e8e6eef59a26cb83f7548c9c3c025c622247b 100644
--- a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py
+++ b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py
@@ -7,7 +7,7 @@ LumiBlockMetaDataTool.applyDQCuts = False
 LumiBlockMetaDataTool.OutputLevel = INFO
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py
index 201541d121250c80e426108e7f69e3961a0d03d4..6551ead1336979897d5de5d2b4393eb7bbb3fef0 100644
--- a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py
+++ b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py
@@ -7,7 +7,7 @@ LumiBlockMetaDataTool.applyDQCuts = True
 LumiBlockMetaDataTool.OutputLevel = INFO
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py b/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py
index c3a1e91bde2d6fa4b769f15221900d616e3c6557..6cecb8ca02c77a10059d0905816325d06bd75465 100644
--- a/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py
+++ b/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py
@@ -19,7 +19,7 @@ LumiBlockMetaDataTool.applyDQCuts = True
 LumiBlockMetaDataTool.OutputLevel = INFO
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py
old mode 100755
new mode 100644
index 1e282cd54ecd8f89b59e705a413b22802785104f..c115e1d863cd29be902c48a24f521cd9ad4d8e4a
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py
@@ -49,7 +49,7 @@ LumiBlockMetaDataTool.applyDQCuts = True
 LumiBlockMetaDataTool.OutputLevel = INFO
 
 # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 svcMgr += MetaDataSvc( "MetaDataSvc" )
 svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py b/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py
index aa4b5e01887df5f73a4af98dea0e06866c6a9141..0438941929f8d29508278d121190d147ba6d63e1 100644
--- a/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py
+++ b/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py
@@ -103,13 +103,3 @@ StreamDPD.AddItem ('TruthParticleContainer#SpclMC')
 StreamDPD.AddItem ('McEventCollection#GEN_AOD')
 
 StreamDPD.ForceRead=TRUE;  #force read of output data objs
-
-
-#Write everything in the AOD
-#StreamDPD.Stream.TakeItemsFromInput=True
-#StreamDPD.Stream_FH.TakeItemsFromInput=True
-
-
-
-
-
diff --git a/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py b/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py
index 8c100a612e8dd9d6e668d2605c431d77f0e23a3f..89f9dff11564ef2736446ab724ad5986ba3e04d9 100644
--- a/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py
+++ b/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py
@@ -103,6 +103,3 @@ StreamDPD.AcceptAlgs(["DPDPhotonFilter"])
 
 #Write everything in the AOD
 StreamDPD.Stream.TakeItemsFromInput=True
-StreamDPD.Stream_FH.TakeItemsFromInput=True
-
-
diff --git a/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py b/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py
index 07671c6861feaad83b9ef43081d287f356419139..f28b0cb93b8d53c6309807561aa16d7661ae44f9 100644
--- a/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py
+++ b/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py
@@ -167,6 +167,3 @@ StreamDPD.AcceptAlgs(["DPDPhotonFilter"])
 #Write everything in the new AOD/ESD
 
 StreamDPD.Stream.TakeItemsFromInput=True
-StreamDPD.Stream_FH.TakeItemsFromInput=True
- 
-
diff --git a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py
index 951d5a50544ee7fb3562cf4d50b0048d923a3b37..93566181e2a48ce524ef6a9157f73d216b5a1dd7 100644
--- a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py
+++ b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py
@@ -48,16 +48,12 @@ class AugmentedNTUPStream( AugmentedStreamBase ):
         return self.Stream.ItemList
 
     def AddMetaDataItem(self, item):
-        #self._AddValidItemToList(item, self.Stream_FH.ItemList)
         return
 
     def RemoveMetaDataItem(self, item):
-        #self._RemoveValidItemFromList(item, self.Stream_FH.ItemList)
-        #return
         pass
 
     def GetMetaDataItems(self):
-        #return self.Stream_FH.ItemList
         pass
 
     #########################################
@@ -77,8 +73,6 @@ class AugmentedNTUPStream( AugmentedStreamBase ):
         print self.GetPrescale()
         print "ItemList:"
         print self.Stream.ItemList
-        #print "MetaData ItemList:"
-        #print self.Stream_FH.ItemList
         return
 #############################################################
 class MultipleNTUPStreamManager:
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
old mode 100755
new mode 100644
index e60566d9c8391c2b1f215f5237a260dbf1d7d915..f447960d93542810e59bb46b146028af4e984e4c
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -1004,7 +1004,7 @@ if globalflags.InputFormat()=='bytestream':
     # FIXME : metadata store definition is in ReadAthenaPool_jobOptions.py
     # copy it there for BS Reading for 13..0.X
     # Add in MetaDataSvc
-    from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+    from AthenaServices.AthenaServicesConf import MetaDataSvc
     svcMgr += MetaDataSvc( "MetaDataSvc" )
     # Add in MetaData Stores
     from StoreGate.StoreGateConf import StoreGateSvc
diff --git a/Simulation/Digitization/python/DigitizationWriteMetaData.py b/Simulation/Digitization/python/DigitizationWriteMetaData.py
index 513b038d87d3ecafb753b10f433bb616bc2ec79d..0cf229f825d62de0670fcd9cf8570f1f2606d4dd 100644
--- a/Simulation/Digitization/python/DigitizationWriteMetaData.py
+++ b/Simulation/Digitization/python/DigitizationWriteMetaData.py
@@ -2,16 +2,6 @@
 
 from AthenaCommon.Logging import logging
 logDigitizationWriteMetadata = logging.getLogger( 'DigitizationWriteMetadata' )
-#-------------------------------------------------
-# Setup MetaData Stream
-#-------------------------------------------------
-#if not hasattr(ServiceMgr, 'MetaDataStore'):
-### In future should probably do a check here
-
-#from AthenaServices.AthenaServicesConf import AthenaOutputStream
-#StreamRDO_FH =  AthenaOutputStream( "StreamRDO_FH" )
-#StreamRDO_FH.ItemList += [ "IOVMetaDataContainer#*" ]
-
 
 myRunNumber = 0
 myEndRunNumber = 2147483647 # the max run number
diff --git a/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py b/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py
index 5d33b129d260f26cb76c9b2e274e06ed7101728f..ad88b7cbfb00608439790658cb0dd05a73159d57 100644
--- a/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py
+++ b/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py
@@ -69,7 +69,7 @@ if TriggerOn == 1:
    #ServiceMgr.TagInfoMgr.AddGeoModelTags = False
     from IOVDbMetaDataTools.IOVDbMetaDataToolsConf import IOVDbMetaDataTool
     ToolSvc += IOVDbMetaDataTool( "IOVDbMetaDataTool" )
-    from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+    from AthenaServices.AthenaServicesConf import MetaDataSvc
     ServiceMgr += MetaDataSvc( "MetaDataSvc" )
     ServiceMgr.MetaDataSvc.MetaDataContainer = "MetaDataHdr"
     ServiceMgr.MetaDataSvc.MetaDataTools += [ "IOVDbMetaDataTool" ]
diff --git a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
index 640f0dff16f2f70a822afda4ce376a46007f4461..234d718e3cd46b4bff93c6a51b956ebe84350121 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
@@ -246,14 +246,6 @@ if hasattr(runArgs,'TruthReductionScheme'):
     topSequence += McEventCollectionFilter
 
 
-if releaseIsOlderThan(17,6):
-    #--------------------------------------------------------------
-    # Copy InFile MetaData using MetaDataTools
-    #-------------------------------------------------------------
-    from AthenaServices.AthenaServicesConf import AthenaOutputStream
-    Stream1_FH = AthenaOutputStream( "StreamHITS_FH" )
-    Stream1_FH.ItemList += [ "IOVMetaDataContainer#*" ]
-
 #--------------------------------------------------------------
 # Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
 #-------------------------------------------------------------
diff --git a/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py b/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py
index c28b867c1565d5b0e1a1c8760b02d4fece48ee54..d3a7f4427424c6066ef8b6f1a39258be4cc2a5d9 100644
--- a/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py
+++ b/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py
@@ -39,10 +39,7 @@ if hasattr(MergeMcEventCollection, 'MergeMcEventCollTool'):
 else:
     MergeMcEventCollection.TruthCollKey = "GEN_EVENT"
 
-try:
-    itemlist = StreamRDO_FH.ItemList
-except:
-    itemlist = StreamRDO.MetaDataItemList
+itemlist = StreamRDO.MetaDataItemList
 
 if itemlist.count( "IOVMetaDataContainer#*" ):
     print 'ZLM found it!'
@@ -54,9 +51,6 @@ print 'ZLM container thingy:',itemlist
 
 itemlist += [ "IOVMetaDataContainer#_Digitization_Parameters" ]
 
-try:
-    print StreamRDO_FH.ItemList
-except:
-    print StreamRDO.MetaDataItemList
+print StreamRDO.MetaDataItemList
 
 
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py
index 2c760097da7cab2122a75a2cfbe53232ed737d97..16be1649ecebef1fc17cf11e9897fc83a880eb9a 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py
@@ -186,7 +186,7 @@ def _setupConfig():
 
         
         if not hasattr( svcMgr, 'MetaDataSvc' ):
-            from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+            from AthenaServices.AthenaServicesConf import MetaDataSvc
             svcMgr += MetaDataSvc( "MetaDataSvc" )
             svcMgr.MetaDataSvc.MetaDataContainer = "MetaDataHdr"
             svcMgr.MetaDataSvc.MetaDataTools += [ "IOVDbMetaDataTool" ]
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py
index 0d4b6ca8526ceff87fa414a1550c51ed4896518d..6988af541f34232f77c7cb4c1cfe242a01228b65 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py
@@ -41,7 +41,7 @@ if useGRL == False:
   LumiBlockMetaDataTool.OutputLevel = DEBUG
 
   # add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-  from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+  from AthenaServices.AthenaServicesConf import MetaDataSvc
   svcMgr += MetaDataSvc( "MetaDataSvc" )
   svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
 
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
index 5736a4a9845a449d9c52d84d3bd7852c7ee08e77..d9056189ad1b8527ec4f9223acabf25156582799 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
@@ -59,7 +59,7 @@ if l1caloRawMon:
         dbpath = "/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite"
         import os.path
         if os.path.isfile(dbpath):
-            from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+            from AthenaServices.AthenaServicesConf import MetaDataSvc
             svcMgr += MetaDataSvc( "MetaDataSvc" )
             #svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=../share/calibJuly.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
             svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=" + dbpath + ";dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
index 4020e382742c592b37b0ac7ddf2f6e2e6f260f33..ac0decd129cc18735be895f268fca36ee9139e16 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
@@ -70,7 +70,7 @@ if l1caloRawMon:
         #dbpath = "/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite"
         #import os.path
         #if os.path.isfile(dbpath):
-        #from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+        #from AthenaServices.AthenaServicesConf import MetaDataSvc
         #svcMgr += MetaDataSvc("MetaDataSvc")
         #svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
                 
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
index 6da4457b3d7b8d09666d7deb5b3df89b0031d9d3..0988d00b0b8223baceec70421fdf8c9ac34d6360 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
@@ -118,7 +118,7 @@ if l1caloRawMon:
         dbpath = "/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite"
         import os.path
         if os.path.isfile(dbpath):
-            from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+            from AthenaServices.AthenaServicesConf import MetaDataSvc
             svcMgr += MetaDataSvc( "MetaDataSvc" )
             #svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=../share/calibJuly.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
             svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
index 4a8a19d91c908cc8f23a96ae94eae5f1ef177489..fb4e927b5570bca0866a20d2cd7cd6c195b18feb 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
@@ -21,7 +21,7 @@ from AthenaServices.AthenaServicesConf import AthenaSealSvc
 from AthenaPoolServices.AthenaRootStreamerSvcConf import AthenaRootStreamerSvc
 from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import EventSelectorAthenaPool
 from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import AthenaPoolAddressProviderSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
 #-------------------------------------------------------------------------------
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()