diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref
index be9a958ef9c11612f71cebb388f65696083e654e..2babf106f91c3bffd4c5624542f130e4449cc06d 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref
@@ -71,9 +71,6 @@ DecisionSvc          INFO Inserting stream: Coll1and7 with no Algs
 DecisionSvc          INFO Inserting stream: Coll348 with no Algs
 DecisionSvc          INFO Inserting stream: CollTrig with no Algs
 DecisionSvc          INFO Inserting stream: CollBad with no Algs
-ToolSvc.copyTool    DEBUG handle() saw BeginTagFile incident for PFN:SplittableCollection.root
-ToolSvc.copyTool    DEBUG Found Input CollectionMetadata
-ToolSvc.copyTool     INFO CollectionMetadata copied to MetaDataStore for PFN:SplittableCollection.root
 Splitter1           DEBUG in execute()
 Splitter1            INFO EventInfo event: 0 run: 0
 Splitter1           DEBUG Trigmask = 1
@@ -468,6 +465,12 @@ Splitter48           INFO L1 passed
 Triggered            INFO EventInfo event: 19 run: 0
 Triggered            INFO L1 passed
 DefaultCollMeta     DEBUG In execute 
+Found 4 proxies for ClassID 167728019 (EventStreamInfo): 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x28044cd0 --- key: Others
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x27230ad0 --- key: Stream1
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x279175c0 --- key: Stream2
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x27ec9950 --- key: Stream3
+Found 1 proxy for ClassID 1296887519 (CollectionMetadataContainer): 
 StorageSvc           INFO EventStreamInfo_p3 [11DF1B8C-0DEE-4687-80D7-E74B520ACBB4]
 Stream2              INFO Records written: 8
 Stream1              INFO Records written: 8
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckExplicit_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckExplicit_jo.py
index 981fc55c11072a94000798ab2867f31d8f378efe..53507918856695e8231ed375fb73bdbb38f4cc67 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckExplicit_jo.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckExplicit_jo.py
@@ -74,7 +74,6 @@ TagTool = RegistrationStreamTagTool("TagTool")
 copyTool = InputCollectionMetadataCopy("copyTool")
 copyTool.OutputLevel = DEBUG
 ToolSvc += copyTool
-svcMgr.MetaDataSvc.MetaDataTools += [copyTool]
 
 # Add algorithm to add default collection metadata
 DefaultCollMeta = RegistrationStreamDefMeta("DefaultCollMeta")
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py
index da1fb84d58c8cc20ac69ac39279493be5dccea99..bc526107ac0f4a2bc253c80f85581bf584ae1c1a 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py
@@ -70,7 +70,6 @@ TagTool = RegistrationStreamTagTool("TagTool")
 copyTool = InputCollectionMetadataCopy("copyTool")
 copyTool.OutputLevel = DEBUG
 ToolSvc += copyTool
-svcMgr.MetaDataSvc.MetaDataTools += [copyTool]
 
 # Add algorithm to add default collection metadata
 DefaultCollMeta = RegistrationStreamDefMeta("DefaultCollMeta")
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py
index 04a4b9ddcbbfbc006ae06e177b52d8f56551a51a..a5b3785d7dd75a767a201a7bc881463b78f47b06 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py
@@ -112,7 +112,7 @@ from RegistrationServices.RegistrationServicesConf import RegistrationStreamDefM
 copyTool = InputCollectionMetadataCopy("copyTool")
 copyTool.OutputLevel = DEBUG
 ToolSvc += copyTool
-svcMgr.MetaDataSvc.MetaDataTools += [copyTool]
+print "BLARG"
 
 # Add algorithm to add default collection metadata
 DefaultCollMeta = RegistrationStreamDefMeta("DefaultCollMeta")
diff --git a/Database/RegistrationServices/src/InputCollectionMetadataCopy.cxx b/Database/RegistrationServices/src/InputCollectionMetadataCopy.cxx
index 713080b8cf04afc2659cb66a1c52d4c7fb3e470b..0ce2a40bf9cfd16cb150a5bb0ee2edc510b78f95 100755
--- a/Database/RegistrationServices/src/InputCollectionMetadataCopy.cxx
+++ b/Database/RegistrationServices/src/InputCollectionMetadataCopy.cxx
@@ -22,7 +22,6 @@ InputCollectionMetadataCopy::InputCollectionMetadataCopy(const std::string& type
    AthAlgTool(type, name, parent), 
    m_pMetaDataStore ("StoreGateSvc/MetaDataStore",      name), 
    m_pInputStore    ("StoreGateSvc/TagMetaDataStore", name) {
-   declareInterface<IMetaDataTool>(this);
 }
 
 //___________________________________________________________________________
diff --git a/Database/RegistrationServices/src/InputCollectionMetadataCopy.h b/Database/RegistrationServices/src/InputCollectionMetadataCopy.h
index 8530dd189ce779d9f40eb25630a42c498cab4d66..d04a9cf6a3b2f794ba2bab067bd2c9b919774205 100755
--- a/Database/RegistrationServices/src/InputCollectionMetadataCopy.h
+++ b/Database/RegistrationServices/src/InputCollectionMetadataCopy.h
@@ -23,7 +23,6 @@ class StoreGateSvc;
  *  @brief This class provides an example for reading in file meta data objects from Pool.
  **/
 class InputCollectionMetadataCopy : public AthAlgTool, 
-                                    virtual public IMetaDataTool, 
                                     virtual public IIncidentListener 
 {
 public: