diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx
old mode 100755
new mode 100644
index e70f92f8ac9aa88b2d65f353bd39a85696534a46..270a508aeb143823ddfc44cddf4b7dfe8417911f
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx
@@ -1,20 +1,4 @@
-/***************************************************************************
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TrkAmbiguitySolver_entries.cxx,v 1.1.1.1 2007-02-21 13:36:44 msiebel Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkAmbiguitySolver/TrkAmbiguitySolver.h"
 
 DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, TrkAmbiguitySolver )
 
-DECLARE_FACTORY_ENTRIES( TrkAmbiguitySolver )
-{
-	DECLARE_NAMESPACE_ALGORITHM( Trk, TrkAmbiguitySolver );
-}
-
-
-
-
-
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx
deleted file mode 100755
index ccc9cda7f226e9346cef4285c56977ff76d49d08..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/***************************************************************************
- ATLAS Collaboration
- ***************************************************************************/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAmbiguitySolver )
-
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx
old mode 100755
new mode 100644
index 4fb9d7e919c3e6fa1c2bb7ea02c9301c1f4516ea..e40c706b40dffad0c4a2b391037d5c0a5fe41ec5
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkCollectionAliasAlg/TrkCollectionAliasAlg.h"
 
 DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk , TrkCollectionAliasAlg )
 
-DECLARE_FACTORY_ENTRIES( TrkCollectionAliasAlg ) {
-  DECLARE_NAMESPACE_ALGORITHM( Trk ,  TrkCollectionAliasAlg )
-}   
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx
deleted file mode 100755
index 3fc666cf1b710dd8e9fa003c8d1e3b65b42b1ce2..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkCollectionAliasAlg )
-
diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx
index 734e7a343985e80ef7c82a4a15645581edaf6e78..6d8dfa7d95efa2cd43850cf148ae83b738170a24 100644
--- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTrackCollectionMerger/TrackCollectionMerger.h"
 
 using namespace Trk;
 
 DECLARE_ALGORITHM_FACTORY( TrackCollectionMerger )
 
-DECLARE_FACTORY_ENTRIES( TrkTrackCollectionMerger )
-{
-  DECLARE_ALGORITHM( TrackCollectionMerger )
-}
-
diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx
deleted file mode 100644
index fe7827ecc26a4e41730351ac3e8254b92a408d20..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackCollectionMerger)
-
diff --git a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx
old mode 100755
new mode 100644
index 9e57d3f91559740afa25cc182263c0128f739ca0..536739159d4517457d0ba9b689db8c490f7179be
--- a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTrackSlimmer/TrackSlimmer.h"
 
 DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk , TrackSlimmer )
 
-DECLARE_FACTORY_ENTRIES( TrkTrackSlimmer ) {
-  DECLARE_NAMESPACE_ALGORITHM( Trk ,  TrackSlimmer )
-}   
diff --git a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx
deleted file mode 100755
index cf3e4b53a3907d9a523b80244c95d5be20182e5e..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackSlimmer )
-
diff --git a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx b/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx
old mode 100755
new mode 100644
index 2559332a6259481d8a814c632750d128d92f5445..a67f15cfa40d34a7c6bfa316972027a8b4a30628
--- a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTruthAlgs/TrackTruthSelector.h"
 #include "TrkTruthAlgs/TrackTruthSimilaritySelector.h"
 #include "../TrackParticleTruthAlg.h"
@@ -7,9 +6,3 @@ DECLARE_ALGORITHM_FACTORY( TrackTruthSelector )
 DECLARE_ALGORITHM_FACTORY( TrackTruthSimilaritySelector )
 DECLARE_ALGORITHM_FACTORY( TrackParticleTruthAlg )
 
-DECLARE_FACTORY_ENTRIES( TrkTruthAlgs ) 
-{
-  DECLARE_ALGORITHM( TrackTruthSelector )
-  DECLARE_ALGORITHM( TrackTruthSimilaritySelector )
-  DECLARE_ALGORITHM( TrackParticleTruthAlg )
-}
diff --git a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx b/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx
deleted file mode 100755
index e1543c66389ccecb66f11f60e84af132c663e0fe..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTruthAlgs )
diff --git a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx
index 79818fae7a1a7efe14936a7c0dec400ff54f9415..faba4bd0d9f1f80c35830b3ce55099109e5d7682 100644
--- a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx
+++ b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkAlignGenAlgs/AlignAlg.h"
 #include "TrkAlignGenAlgs/SelectEventNumber.h"
 #include "TrkAlignGenAlgs/AlignSolve.h"
@@ -9,10 +8,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SelectEventNumber )
 DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, AlignSolve )
 DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, AlignTrackCollSplitter )
 
-DECLARE_FACTORY_ENTRIES( TrkAlignGenAlgs )
-{
-  DECLARE_NAMESPACE_ALGORITHM( Trk, AlignAlg )
-  DECLARE_NAMESPACE_ALGORITHM( Trk, SelectEventNumber )
-  DECLARE_NAMESPACE_ALGORITHM( Trk, AlignSolve )
-  DECLARE_NAMESPACE_ALGORITHM( Trk, AlignTrackCollSplitter )
-}
diff --git a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx
deleted file mode 100644
index 8afaffd28ce05d5e29de06a4c21eb308e27d2d69..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAlignGenAlgs )
-
diff --git a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx b/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx
index 3deaad01c5423dcd626ce41a1d6f370831d85334..11d1825234c47c8499f855feb3f2e29cbd31f8d5 100644
--- a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx
+++ b/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkAlignGenTools/MatrixTool.h"
 #include "TrkAlignGenTools/IPCMatrixTool.h"
 #include "TrkAlignGenTools/TrkAlignDBTool.h"
@@ -29,21 +28,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AlignResidualCalculator )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BeamspotVertexPreProcessor )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ConstrainedTrackProvider )
 
-
-DECLARE_FACTORY_ENTRIES( TrkAlignGenTools )
-{
-  DECLARE_NAMESPACE_TOOL( Trk, MatrixTool )
-  DECLARE_NAMESPACE_TOOL( Trk, IPCMatrixTool )
-  DECLARE_NAMESPACE_TOOL( Trk, TrkAlignDBTool )
-  DECLARE_NAMESPACE_TOOL( Trk, AnalyticalDerivCalcTool )
-  DECLARE_NAMESPACE_TOOL( Trk, ShiftingDerivCalcTool )
-  DECLARE_NAMESPACE_TOOL( Trk, TrackCollectionProvider )
-  DECLARE_NAMESPACE_TOOL( Trk, MSConstraintTracksProvider )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignTrackPreProcessor )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignTrackCreator )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignTrackDresser )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignModuleTool )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignResidualCalculator )
-  DECLARE_NAMESPACE_TOOL( Trk, BeamspotVertexPreProcessor )
-  DECLARE_NAMESPACE_TOOL( Trk, ConstrainedTrackProvider )
-}
diff --git a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx b/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx
deleted file mode 100644
index 9c288b58c92374f402b1e436763ae4b766558d8d..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAlignGenTools )
-
diff --git a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx
index c6713d305a6ec8148d3a35bf8df510ab721d025e..88c61ec80fc7ca79f2dbff25e99857484a15f5d1 100644
--- a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx
+++ b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkGlobalChi2AlignTools/GlobalChi2AlignTool.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, GlobalChi2AlignTool )
 
-DECLARE_FACTORY_ENTRIES( TrkGlobalChi2AlignTools )
-{
-    DECLARE_NAMESPACE_ALGORITHM( Trk, GlobalChi2AlignTool );
-}
diff --git a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx
deleted file mode 100644
index 37e8cb9767fefe790c257463279fc9c4a1aa872c..0000000000000000000000000000000000000000
--- a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkGlobalChi2AlignTools )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx
old mode 100755
new mode 100644
index db2d8e10a4f43fa554fa5f7c6da36a42ad7d6ef3..cc450d5e99a79ad9bde200ec9b394fb71b1ae999
--- a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkDetDescrAlgs/MaterialMapping.h"
 #include "TrkDetDescrAlgs/MaterialManipulation.h"
 #include "TrkDetDescrAlgs/MaterialValidation.h"
@@ -11,9 +10,4 @@ DECLARE_ALGORITHM_FACTORY( MaterialValidation )
 
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrAlgs )
-{
-    DECLARE_ALGORITHM( MaterialMapping )
-    DECLARE_ALGORITHM( MaterialManipulation )
-    DECLARE_ALGORITHM( MaterialValidation )
-}
+
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx
deleted file mode 100755
index f00ef9d92830493d58011548fba219af9b00fe8b..0000000000000000000000000000000000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrAlgs )
-
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx
old mode 100755
new mode 100644
index 6de965088a1bc73d314bc32cdfaa5605f69b2060..57e75c58f82a99bdaf3852ce7cfb59dca0590b5d
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx
@@ -1,13 +1,8 @@
 #include "TrkDetDescrSvc/TrackingGeometrySvc.h"
 #include "TrkDetDescrSvc/TrackingVolumesSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 using namespace Trk;
 
 DECLARE_SERVICE_FACTORY( TrackingGeometrySvc )
 DECLARE_SERVICE_FACTORY( TrackingVolumesSvc )
 
-DECLARE_FACTORY_ENTRIES(TrkDetDescrSvc) {
-    DECLARE_SERVICE   ( TrackingGeometrySvc )
-    DECLARE_SERVICE   ( TrackingVolumesSvc )
-}
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_load.cxx
deleted file mode 100755
index 800e30892593883b95da6f4a89d875bd495fd9b8..0000000000000000000000000000000000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrSvc )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx
old mode 100755
new mode 100644
index 94b51dfece0cf0307db5d6175d6af08a10699263..72e3de3b1e852eff8d745ec28e774c48ee846f52
--- a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkDetDescrTestTools/GeometryAsciiDumper.h"
 #include "TrkDetDescrTestTools/GeometryTTreeDumper.h"
 #include "TrkDetDescrTestTools/MaterialMapper.h"
@@ -24,18 +23,4 @@ DECLARE_TOOL_FACTORY( TrackingVolumeDisplayer )
 DECLARE_TOOL_FACTORY( GeometryJsonDumper )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrTestTools )
-{
-    DECLARE_TOOL( GeometryAsciiDumper )
-    DECLARE_TOOL( GeometryTTreeDumper )
-    DECLARE_TOOL( MaterialMapper )
-    DECLARE_TOOL( VertexMapper )
-    DECLARE_TOOL( LayerMaterialInspector )
-    DECLARE_TOOL( LayerMaterialAnalyser )
-    DECLARE_TOOL( RandomSurfaceBuilder )
-    DECLARE_TOOL( RecursiveGeometryProcessor )    
-    DECLARE_TOOL( TrackingVolumeDisplayer )
-    DECLARE_TOOL( GeometryJsonDumper )
-}
-
 
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_load.cxx
deleted file mode 100755
index ad6eead03cb4e7069938552735f371f2ef0d3aa8..0000000000000000000000000000000000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrTestTools )
-
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx
old mode 100755
new mode 100644
index 66f7e6fec9b53529ec908173ca52cf7045570aab..bd9d7fa7168f611d53b1811c553b8d1fd822d5f4
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkDetDescrTools/CylinderVolumeCreator.h"
 #include "TrkDetDescrTools/BinnedLayerMaterialCreator.h"
 #include "TrkDetDescrTools/CompoundLayerMaterialCreator.h"
@@ -30,19 +29,4 @@ DECLARE_TOOL_FACTORY( TrackingVolumeArrayCreator )
 DECLARE_TOOL_FACTORY( TrackingVolumeHelper )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrTools )
-{
-    DECLARE_TOOL( CylinderVolumeCreator )
-    DECLARE_TOOL( BinnedLayerMaterialCreator )
-    DECLARE_TOOL( CompoundLayerMaterialCreator )
-    DECLARE_TOOL( CompressedLayerMaterialCreator )
-    DECLARE_TOOL( GeometryBuilder )
-    DECLARE_TOOL( GenericGeometryBuilder )
-    DECLARE_TOOL( LayerArrayCreator )
-    DECLARE_TOOL( LayerProvider )
-    DECLARE_TOOL( LayerMaterialProvider )
-    DECLARE_TOOL( LayerMaterialConverter )
-    DECLARE_TOOL( InputLayerMaterialProvider )    
-    DECLARE_TOOL( TrackingVolumeArrayCreator )
-    DECLARE_TOOL( TrackingVolumeHelper )
-}
+
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_load.cxx
deleted file mode 100755
index 64eae4c303a601be9293b79cfc09ecaf2a23f8ad..0000000000000000000000000000000000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrTools )
-
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx
old mode 100755
new mode 100644
index a2b19454a611165c17d4bbbbf2863d6ccfa2012a..dc028d075a4fd879e06f38052dd09fc13ba72cc6
--- a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkDetDescrUnitTests/TrkDetDescrTPCnvTest.h"
 #include "TrkDetDescrUnitTests/BinUtilityTest.h"
 #include "TrkDetDescrUnitTests/TrackingGeometryTest.h"
@@ -15,12 +14,5 @@ DECLARE_ALGORITHM_FACTORY( MappingTest )
 
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrUnitTests )
-{
-    DECLARE_ALGORITHM( BinUtilityTest )
-    DECLARE_ALGORITHM( TrkDetDescrTPCnvTest )
-    DECLARE_ALGORITHM( TrackingGeometryTest )
-    DECLARE_ALGORITHM( SurfaceIntersectionTest )
-    DECLARE_ALGORITHM( MappingTest )
     
-}
+
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_load.cxx
deleted file mode 100755
index 3f9d5faa5b6b17effbccb20b4a775b40e90f6e76..0000000000000000000000000000000000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrUnitTests )
-
diff --git a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx b/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx
old mode 100755
new mode 100644
index 49bf81ad428e27e0786acbecc0406df86f529b55..bdbf369ca4b3ece8d423dfb6af18c424065bc72f
--- a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx
+++ b/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkEventCnvTools/EventCnvSuperTool.h"
 
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, EventCnvSuperTool )
 
-DECLARE_FACTORY_ENTRIES(TrkEventCnvTools)
-{ // in this package name these methods are registered 
-  DECLARE_NAMESPACE_TOOL(Trk, EventCnvSuperTool)
-}
diff --git a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_load.cxx b/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_load.cxx
deleted file mode 100755
index 22c2177e1d9e778f86d3f7ee807483d719729d5e..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkEventCnvTools)
diff --git a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx b/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx
index 4e753f5c16138f724c076c5216f8b7e96844ea32..3690f9b700c1280a52df79f84ebb9fce09f9d6a2 100644
--- a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx
+++ b/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx
@@ -1,7 +1,6 @@
 #include "TrkJiveXML/SegmentRetriever.h"
 #include "TrkJiveXML/TrackRetriever.h"
 #include "TrkJiveXML/VertexRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 using namespace JiveXML;
 
@@ -9,8 +8,3 @@ DECLARE_TOOL_FACTORY(SegmentRetriever)
 DECLARE_TOOL_FACTORY(TrackRetriever)
 DECLARE_TOOL_FACTORY(VertexRetriever)
 
-DECLARE_FACTORY_ENTRIES(TrkJiveXML) {
-  DECLARE_ALGTOOL(SegmentRetriever)
-  DECLARE_ALGTOOL(TrackRetriever)
-  DECLARE_ALGTOOL(VertexRetriever)
-}
diff --git a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_load.cxx b/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_load.cxx
deleted file mode 100644
index 630bbe2bcd463bfc925cadac96f112235c999bad..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkJiveXML)
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx b/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx
old mode 100755
new mode 100644
index bd3e81d3e959975d800350d4f501e8254d2da000..47831951cbe1f3780149cccf5a6183744fc4d9cd
--- a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExAlgs/ExtrapolatorTest.h"
 #include "TrkExAlgs/CombinedExtrapolatorTest.h"
 #include "TrkExAlgs/CETmaterial.h"
@@ -15,11 +14,3 @@ DECLARE_ALGORITHM_FACTORY( EnergyLossExtrapolationValidation )
 DECLARE_ALGORITHM_FACTORY( CombinedExtrapolatorTest )
 DECLARE_ALGORITHM_FACTORY( CETmaterial )
 
-DECLARE_FACTORY_ENTRIES( TrkExAlgs ) {
-  DECLARE_ALGORITHM( RiddersAlgorithm )
-  DECLARE_ALGORITHM( ExtrapolatorTest )
-  DECLARE_ALGORITHM( ExtrapolationValidation )
-  DECLARE_ALGORITHM( EnergyLossExtrapolationValidation )
-  DECLARE_ALGORITHM( CombinedExtrapolatorTest )
-  DECLARE_ALGORITHM( CETmaterial )
-}   
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_load.cxx b/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_load.cxx
deleted file mode 100755
index 9543df073a52a0f9c2b67c1ffacbb8aea8f3c8ae..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExAlgs )
-
diff --git a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx b/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx
old mode 100755
new mode 100644
index e9f40a9439d4fa43f4e46d63f15b3b94bc0dc414..dcc3abf0758ec23f69f7cd5f977ff77129d4a4be
--- a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExEngine/ExtrapolationEngine.h"
 #include "TrkExEngine/StaticEngine.h"
 #include "TrkExEngine/StaticNavigationEngine.h"
@@ -16,14 +15,4 @@ DECLARE_TOOL_FACTORY( PropagationEngine )
 DECLARE_TOOL_FACTORY( StepEngine )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExEngine )
-{
-    DECLARE_TOOL( ExtrapolationEngine )
-    DECLARE_TOOL( MaterialEffectsEngine )        
-    DECLARE_TOOL( StaticEngine )
-    DECLARE_TOOL( StaticNavigationEngine )
-    DECLARE_TOOL( PropagationEngine )
-    DECLARE_TOOL( StepEngine )
-}
-
 
diff --git a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_load.cxx b/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_load.cxx
deleted file mode 100755
index 563e2d8a5549da993596bbb0c212d350ff499269..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExEngine )
-
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx
old mode 100755
new mode 100644
index 86db8ba005283f398d015d4f564c1ec186525be6..0a0264e6a8d3c06f0d51243f52d564167d6c298b
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExRungeKuttaIntersector/IntersectorWrapper.h"
 #include "TrkExRungeKuttaIntersector/RungeKuttaIntersector.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, IntersectorWrapper )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, RungeKuttaIntersector )
-DECLARE_FACTORY_ENTRIES( TrkExRungeKuttaIntersector )
-{
-    DECLARE_NAMESPACE_TOOL( Trk, IntersectorWrapper )
-    DECLARE_NAMESPACE_TOOL( Trk, RungeKuttaIntersector )
-}
+
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_load.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_load.cxx
deleted file mode 100755
index 9cee5bc4b050fae54f238f7aa283c8692d06e396..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExRungeKuttaIntersector )
-
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx
old mode 100755
new mode 100644
index 3163d9b61f48ef6cbd3efe000ce29e36490c33c9..0e4fdfc0087dfcfea603ed09c1c4d0224843c370
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExRungeKuttaPropagator/RungeKuttaPropagator.h"
 
 using namespace Trk;
@@ -6,8 +5,4 @@ using namespace Trk;
 DECLARE_TOOL_FACTORY( RungeKuttaPropagator )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExRungeKuttaPropagator )
-{
-    DECLARE_TOOL( RungeKuttaPropagator )
-}
 
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_load.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_load.cxx
deleted file mode 100755
index 88ab7fe92bfd6fe9a2057ec7eca8a7a7b4a44808..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExRungeKuttaPropagator )
diff --git a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx
old mode 100755
new mode 100644
index cde2f05937b7ca8b5521d535245bee886de68416..732e8c9308384e8f55eb799496f536732674dfb4
--- a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExSTEP_Propagator/STEP_Propagator.h"
 
 using namespace Trk;
@@ -6,8 +5,4 @@ using namespace Trk;
 DECLARE_TOOL_FACTORY( STEP_Propagator )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExSTEP_Propagator )
-{
-    DECLARE_TOOL( STEP_Propagator )
-}
 
diff --git a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_load.cxx b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_load.cxx
deleted file mode 100755
index 8ca485a58032896f63d4f5a634855a82e703523c..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExSTEP_Propagator )
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx
old mode 100755
new mode 100644
index 48593d54165849334d2076dd9226c83e652a85f8..78a1ff6ca739eef102d410b7f6c69d759ce52bfe
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExSolenoidalIntersector/SolenoidalIntersector.h"
 
 typedef Trk::SolenoidalIntersector TrkSolenoidalIntersector;
 DECLARE_TOOL_FACTORY( TrkSolenoidalIntersector )
 
-DECLARE_FACTORY_ENTRIES( TrkExSolenoidalIntersector )
-{
-    DECLARE_NAMESPACE_TOOL( Trk, SolenoidalIntersector )
-}
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_load.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_load.cxx
deleted file mode 100755
index 97fdfcbf98d2c4ae9084a77530a2f41831e15f13..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExSolenoidalIntersector )
-
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx
old mode 100755
new mode 100644
index 7b574b148f45acb9dfd71eb5c8b0bddcc7d639aa..ca31a3aa4a366238d728613b5caff830ac4399c2
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExStraightLineIntersector/StraightLineIntersector.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, StraightLineIntersector )
-DECLARE_FACTORY_ENTRIES( TrkExStraightLineIntersector )
-{
-    DECLARE_NAMESPACE_TOOL( Trk, StraightLineIntersector )
-}
+
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_load.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_load.cxx
deleted file mode 100755
index 1d4387156d296ec8dd9cb8b9fa4d849ffb36eaeb..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExStraightLineIntersector )
-
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx
old mode 100755
new mode 100644
index c32868ea42ac477494c19407215bfc313c6f01f8..3e5c1adecb79131f2262677fc6b6379828b38d09
--- a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExTools/Extrapolator.h"
 #include "TrkExTools/Navigator.h"
 #include "TrkExTools/MaterialEffectsUpdator.h"
@@ -21,16 +20,3 @@ DECLARE_TOOL_FACTORY( NIMatEffUpdator )
 
 /** factory entries need to have the name of the package */
 
-DECLARE_FACTORY_ENTRIES( TrkExTools )
-{
-    DECLARE_TOOL( Extrapolator )
-    DECLARE_TOOL( TimedExtrapolator )
-    DECLARE_TOOL( Navigator )  
-    DECLARE_TOOL( MaterialEffectsUpdator )
-    DECLARE_TOOL( DummyMaterialEffectsUpdator )
-    DECLARE_TOOL( EnergyLossUpdator )
-    DECLARE_TOOL( MultipleScatteringUpdator )
-    DECLARE_TOOL( NIMatEffUpdator )
-}
-
-
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_load.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_load.cxx
deleted file mode 100755
index ae0178cefee886fccd1819bc137e8c79b31579ad..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExTools )
-
diff --git a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx b/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx
old mode 100755
new mode 100644
index 2e6e50fbbcbb9259d78704f58c41b74fe673e2ad..1fc7b35ca0f84209ba4290ebb22faeafc9938193
--- a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkExUnitTests/ExtrapolationEngineTest.h"
 
 using namespace Trk;
@@ -6,7 +5,4 @@ using namespace Trk;
 DECLARE_ALGORITHM_FACTORY( ExtrapolationEngineTest )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExUnitTests )
-{
-    DECLARE_ALGORITHM( ExtrapolationEngineTest )
-}
+
diff --git a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_load.cxx b/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_load.cxx
deleted file mode 100755
index 515b6702dbe5a07cda509be2fe95aa9d7a772137..0000000000000000000000000000000000000000
--- a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExUnitTests )
-
diff --git a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx
old mode 100755
new mode 100644
index a8d83c3124924bcfa28bd4c184e13999d676eddf..9ce9a165777e6b3a5981bfe007539e76c285a6bd
--- a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx
+++ b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx
@@ -1,20 +1,8 @@
-
 #include "TrkDeterministicAnnealingFilter/DeterministicAnnealingFilter.h"
 #include "TrkDeterministicAnnealingFilter/DAF_WeightCalculator.h"
 #include "TrkDeterministicAnnealingFilter/DAF_SimpleWeightCalculator.h"
 
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
-
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DeterministicAnnealingFilter )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DAF_WeightCalculator )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DAF_SimpleWeightCalculator )
 
-DECLARE_FACTORY_ENTRIES(TrkDeterministicAnnealingFilter)
-{ // in this package name these methods are registered 
-  DECLARE_NAMESPACE_TOOL(Trk, DeterministicAnnealingFilter)
-  DECLARE_NAMESPACE_TOOL(Trk, DAF_WeightCalculator)
-  DECLARE_NAMESPACE_TOOL(Trk, DAF_SimpleWeightCalculator)
-}
-
diff --git a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_load.cxx b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_load.cxx
deleted file mode 100755
index 73d2b9a416e75548a1c7d1905f7218ba11e8e979..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkDeterministicAnnealingFilter)
diff --git a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx b/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx
old mode 100755
new mode 100644
index 4a45bcfa8e8a8f2fce5cfb7361a92a36379926ae..e848697e08fe9917ddd8e3a70ed782be59a52564
--- a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx
+++ b/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx
@@ -1,10 +1,4 @@
 #include "TrkDistributedKalmanFilter/DistributedKalmanFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DistributedKalmanFilter )
 
-DECLARE_FACTORY_ENTRIES(TrkDistributedKalmanFilter)
-{ // in this package name these methods are registered 
-  DECLARE_NAMESPACE_TOOL(Trk, DistributedKalmanFilter)
-}
-
diff --git a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_load.cxx b/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_load.cxx
deleted file mode 100755
index 8fbb22cecf281caefa690fc95a11897b0bf1c331..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkDistributedKalmanFilter)
diff --git a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx
old mode 100755
new mode 100644
index 8d272ae1115e99e7606c5c5b8e1a4e1e79f0d8aa..eecb8b97f276f96d190dbd87ade1bf38a2054179
--- a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx
+++ b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx
@@ -1,12 +1,4 @@
 #include "TrkDynamicNoiseAdjustor/InDetDynamicNoiseAdjustment.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, InDetDynamicNoiseAdjustment )
 
-DECLARE_FACTORY_ENTRIES(TrkDynamicNoiseAdjustor)
-{ // in this package name these methods are registered 
-  DECLARE_NAMESPACE_TOOL(Trk, InDetDynamicNoiseAdjustment)
-}
-
diff --git a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_load.cxx b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_load.cxx
deleted file mode 100755
index 97ac9c9b8bd0a0ff8b0232dec8b055d4aac37f3c..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkDynamicNoiseAdjustor)
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
old mode 100755
new mode 100644
index 167e7949702e7477cbaa48ee04099daea6d9140d..cf3f661ad07dc1909b1f00fb9476615be2dc037e
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
 #include "TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h"
 #include "TrkGaussianSumFilter/MultiComponentStateModeCalculator.h"
 #include "TrkGaussianSumFilter/MultiStateMaterialEffectsAdapter.h"
@@ -49,29 +47,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, GsfExtrapolator )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, GsfSmoother )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BremFind )
 
-DECLARE_FACTORY_ENTRIES( TrkGaussianSumFilter )
-{
-  DECLARE_NAMESPACE_TOOL( Trk, QuickCloseComponentsMultiStateMerger )
-  DECLARE_NAMESPACE_TOOL( Trk, MultiComponentStateModeCalculator )
-  DECLARE_NAMESPACE_TOOL( Trk, MultiStateMaterialEffectsAdapter )
-  DECLARE_NAMESPACE_TOOL( Trk, KullbackLeiblerComponentDistance )
-  DECLARE_NAMESPACE_TOOL( Trk, CloseComponentsMultiStateMerger )
-  DECLARE_NAMESPACE_TOOL( Trk, LargestWeightsMultiStateMerger )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfMaterialMixtureConvolution )
-  DECLARE_NAMESPACE_TOOL( Trk, MahalanobisComponentDistance )
-  DECLARE_NAMESPACE_TOOL( Trk, MultiComponentStateAssembler )
-  DECLARE_NAMESPACE_TOOL( Trk, MultiComponentStateCombiner )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfCombinedMaterialEffects )
-  DECLARE_NAMESPACE_TOOL( Trk, PosteriorWeightsCalculator )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfMaterialEffectsUpdator )
-  DECLARE_NAMESPACE_TOOL( Trk, MultipleScatterUpdator )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfBetheHeitlerEffects )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfMeasurementUpdator )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfEnergyLossUpdator )
-  DECLARE_NAMESPACE_TOOL( Trk, GaussianSumFitter )
-  DECLARE_NAMESPACE_TOOL( Trk, ForwardGsfFitter )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfOutlierLogic )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfExtrapolator )
-  DECLARE_NAMESPACE_TOOL( Trk, GsfSmoother )
-  DECLARE_NAMESPACE_TOOL( Trk, BremFind )  
-}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_load.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_load.cxx
deleted file mode 100755
index 101cefe255a016e8dbba7e84238793255e862e09..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkGaussianSumFilter )
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx
old mode 100755
new mode 100644
index be8b4eab76cd85bbee310f063bafa00060656533..304f2905745b9fe10ddda7b2e03d2fc836b3703d
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx
@@ -1,12 +1,5 @@
 #include "TrkGlobalChi2Fitter/GlobalChi2Fitter.h"
 
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk,GlobalChi2Fitter )
 
-DECLARE_FACTORY_ENTRIES(TrkGlobalChi2Fitter)
-{
-DECLARE_NAMESPACE_TOOL(Trk,GlobalChi2Fitter)
-
-
-}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_load.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_load.cxx
deleted file mode 100755
index 3253723ff34f197313d3557aa00793d99e2a533f..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkGlobalChi2Fitter)
-
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx
old mode 100755
new mode 100644
index 96c125e2bc8b48bd525544fb1770b292c7648917..2665d934301471dd03ab0420686a9213d769261a
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx
@@ -6,9 +6,6 @@
 #include "TrkKalmanFitter/KalmanSmoother.h"
 #include "TrkKalmanFitter/MeasRecalibSteeringTool.h"
 #include "TrkKalmanFitter/KalmanPiecewiseAnnealingFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ForwardKalmanFitter )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ForwardRefTrackKalmanFitter )
@@ -19,15 +16,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanSmoother )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, MeasRecalibSteeringTool )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanPiecewiseAnnealingFilter )
 
-DECLARE_FACTORY_ENTRIES(TrkKalmanFitter)
-{ // in this package name these methods are registered 
-  DECLARE_NAMESPACE_TOOL(Trk, ForwardKalmanFitter)
-  DECLARE_NAMESPACE_TOOL(Trk, ForwardRefTrackKalmanFitter)
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanFitter)
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanOutlierLogic)
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanOutlierRecovery_InDet )
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanSmoother)
-  DECLARE_NAMESPACE_TOOL(Trk, MeasRecalibSteeringTool )
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanPiecewiseAnnealingFilter )
-}
-
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_load.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_load.cxx
deleted file mode 100755
index 44133426de9d8764414ed94a9c9a92d5f8d72a9b..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkKalmanFitter)
diff --git a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx b/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx
old mode 100755
new mode 100644
index 34f27c6ef0dc3d8d7f03dc077777fa7ab09dfb08..18d3e489bb05efc627232ac3ee05fd163fd17840
--- a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx
+++ b/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx
@@ -1,9 +1,5 @@
 #include "TrkRefitAlg/ReFitTrack.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 using namespace Trk;
 DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, ReFitTrack )
 
-DECLARE_FACTORY_ENTRIES(TrkRefitAlg) {
-    DECLARE_NAMESPACE_ALGORITHM( Trk, ReFitTrack)
-}
diff --git a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_load.cxx b/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_load.cxx
deleted file mode 100755
index 6b7ff242a098205cf60c845176b44454f21f77fe..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkRefitAlg)
-
-
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx
old mode 100755
new mode 100644
index cc06ed6e4b9d03f5d6c22676f3389407eab8253d..fb167b79995afa7d9ac4fa7e3f5027941fcd85cc
--- a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkiPatFitter/iPatGlobalFitter.h"
 #include "TrkiPatFitter/MaterialAllocator.h"
 
@@ -6,9 +5,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, iPatFitter )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, iPatGlobalFitter )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, MaterialAllocator )
 
-DECLARE_FACTORY_ENTRIES( TrkiPatFitter )
-{
-    DECLARE_NAMESPACE_TOOL( Trk, iPatFitter )
-    DECLARE_NAMESPACE_TOOL( Trk, iPatGlobalFitter )	
-    DECLARE_NAMESPACE_TOOL( Trk, MaterialAllocator )	
-}
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_load.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_load.cxx
deleted file mode 100755
index 233b41979d693537d9aa2608578b572c94772bf8..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkiPatFitter )
-
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx b/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx
index bd0499f5f6f44d3c7a18899166507265d748c6dd..539a677eb33b0372af2d3b359e0fe49d6598430b 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx
+++ b/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkG4UserActions/MaterialStepRecorderTool.h"
 //#include "TrkG4UserActions/EnergyLossRecorderTool.h"
 #include "TrkG4UserActions/GeantFollowerTool.h"
@@ -13,11 +12,3 @@ DECLARE_TOOL_FACTORY( G4UA::GeantFollowerTool )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk , GeantFollowerMSHelper )
 DECLARE_TOOL_FACTORY( G4UA::GeantFollowerMSTool )
 
-DECLARE_FACTORY_ENTRIES( TrkG4UserActions ) {
-    DECLARE_TOOL( G4UA::MaterialStepRecorderTool )
-    //    DECLARE_TOOL( G4UA::EnergyLossRecorderTool )
-    DECLARE_TOOL( G4UA::GeantFollowerTool )
-    DECLARE_NAMESPACE_TOOL( Trk , GeantFollowerHelper )
-    DECLARE_TOOL( G4UA::GeantFollowerMSTool )
-    DECLARE_NAMESPACE_TOOL( Trk , GeantFollowerMSHelper )
-}
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_load.cxx b/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_load.cxx
deleted file mode 100644
index 08acf4c16e34dfb76ad5f8577aba4aba5abb0130..0000000000000000000000000000000000000000
--- a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkG4UserActions )
-
-
-
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx
index 77898a886cbef39cf751dc07a287a9274dbc7c18..dd0c514b2baf920b4380418eefda40f68502b189 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "../SimpleAmbiguityProcessorTool.h"
 #include "../TrackSelectionProcessorTool.h"
 #include "../TrackScoringTool.h"
@@ -12,14 +11,3 @@ DECLARE_TOOL_FACTORY(SimpleAmbiguityProcessorTool)
 DECLARE_TOOL_FACTORY(TrackSelectionProcessorTool)
 DECLARE_TOOL_FACTORY(TrackScoringTool)
 
-DECLARE_FACTORY_ENTRIES( TrkAmbiguityProcessor )
-{
-  DECLARE_TOOL(DenseEnvironmentsAmbiguityProcessorTool)
-	DECLARE_TOOL(SimpleAmbiguityProcessorTool)
-	DECLARE_TOOL(TrackSelectionProcessorTool)
-	DECLARE_TOOL(TrackScoringTool)
-}
-
-
-
-
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_load.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_load.cxx
deleted file mode 100644
index 6cf3e063c8195bde22ff5cb46c9ddd65a896b75a..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TrkAmbiguityProcessor_load.cxx,v 1.1.1.1 2003-10-28 14:32:54 emoyse Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAmbiguityProcessor )
-
-
-//LOAD_FACTORY_ENTRIES(AmbiTool )
diff --git a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx b/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx
old mode 100755
new mode 100644
index 40ac54b3c57ea304aad406883485c5c05508fd7d..83d53fce593217adc4003055c4d27417d1b345a1
--- a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx
+++ b/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx
@@ -1,13 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkAssociationTools/PRD_AssociationTool.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, PRD_AssociationTool )
 
-DECLARE_FACTORY_ENTRIES( TrkAssociationTools )
-{
-	DECLARE_NAMESPACE_TOOL(Trk, PRD_AssociationTool)
-}
-
-
-
-
diff --git a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_load.cxx b/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_load.cxx
deleted file mode 100755
index a804b08003c29b3f693aab67c9da68b7c86dbac3..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TrkAssociationTools_load.cxx,v 1.2 2005-06-22 13:41:58 emoyse Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAssociationTools )
-
-
-//LOAD_FACTORY_ENTRIES(AmbiTool )
diff --git a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index d361927307740045013fffc1ce31636ad70e418f..31ec20394e82f1fea8d67c0e96302e3a098ed745
--- a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx
+++ b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkCompetingRIOsOnTrackTool/CompetingRIOsOnTrackTool.h"
 
 using namespace Trk;
 DECLARE_TOOL_FACTORY(CompetingRIOsOnTrackTool)
 
-DECLARE_FACTORY_ENTRIES(TrkCompetingRIOsOnTrackTool) {
-  DECLARE_TOOL(CompetingRIOsOnTrackTool)
-}
-
diff --git a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_load.cxx b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_load.cxx
deleted file mode 100755
index ffa1f2d74c4c03c040a9b62dfe71aa0f8d232809..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkCompetingRIOsOnTrackTool)
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx
old mode 100755
new mode 100644
index 56846092ff437e418f58ffd134e1cc3d62e3cd78..c2805f211cb210e473bb370bb995a6dc96f2d86d
--- a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx
+++ b/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkMaterialProvider/TrkMaterialProviderTool.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrkMaterialProviderTool )
 
-DECLARE_FACTORY_ENTRIES( TrkMaterialProvider )
-{
-  DECLARE_NAMESPACE_TOOL( Trk, TrkMaterialProviderTool )
-}
-
-
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_load.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_load.cxx
deleted file mode 100755
index fb05d3fbd2b88b1b6152c138d74c487ad7cc7322..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkMaterialProvider )
-
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx b/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx
old mode 100755
new mode 100644
index dfb5ac8d432a75bdcc94f55031da4261760f93ea..6fbabcbe7436950260ddb2d512e74adefb48a2b4
--- a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx
@@ -2,20 +2,9 @@
 #include "TrkMeasurementUpdator/KalmanUpdatorSMatrix.h"
 #include "TrkMeasurementUpdator/KalmanUpdatorAmg.h"
 #include "TrkMeasurementUpdator/KalmanWeightUpdator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanUpdator )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanUpdatorSMatrix )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanUpdatorAmg )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanWeightUpdator )
 
-DECLARE_FACTORY_ENTRIES(TrkMeasurementUpdator)
-{ // in this package name these methods are registered 
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanUpdator)
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanUpdatorSMatrix)
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanUpdatorAmg)
-  DECLARE_NAMESPACE_TOOL(Trk, KalmanWeightUpdator)
-}
-
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_load.cxx b/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_load.cxx
deleted file mode 100755
index 666c1bf410493efd14be95ca9e3cea4eef3c138b..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkMeasurementUpdator)
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx b/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx
old mode 100755
new mode 100644
index bb7c2b6559b698d2bbcb63cc01a1f50873d7181e..444f33e468eb12392af265d6caaaa44ef766a69c
--- a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx
+++ b/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx
@@ -1,12 +1,4 @@
 #include "TrkMeasurementUpdator_xk/KalmanUpdator_xk.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
-using namespace Trk;
-
-DECLARE_TOOL_FACTORY( KalmanUpdator_xk )
-
-DECLARE_FACTORY_ENTRIES( TrkMeasurementUpdator_xk )
-{ 
-  DECLARE_TOOL( KalmanUpdator_xk )
-}
+DECLARE_TOOL_FACTORY( Trk::KalmanUpdator_xk )
 
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_load.cxx b/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_load.cxx
deleted file mode 100755
index 7aa07a96ca47a95c6b61b7e63de217a74458dc79..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkMeasurementUpdator_xk)
diff --git a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx b/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx
old mode 100755
new mode 100644
index d12730817360ce1a99bb757e291ae62023d90651..b5b4810e1d5b6a8f072ffe5b421c4c4a12e25500
--- a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx
+++ b/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkParticleCreator/TrackParticleCreatorTool.h"
 
 using namespace Trk ;
@@ -6,7 +5,4 @@ using namespace Trk ;
 DECLARE_TOOL_FACTORY( TrackParticleCreatorTool )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkParticleCreator )
-{
-    DECLARE_TOOL( TrackParticleCreatorTool )
-}
+
diff --git a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_load.cxx b/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_load.cxx
deleted file mode 100755
index 4d76054f9343901b8819e72e6abab0e27ec6b637..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkParticleCreator  )
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx
old mode 100755
new mode 100644
index 5174e7744abda8ea135636c7b01b79d63f32608c..cf6abc6c7a091ac28a9bb5eebba4140af497a783
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx
@@ -1,14 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkRIO_OnTrackCreator/RIO_OnTrackCreator.h"
 #include "TrkRIO_OnTrackCreator/RIO_OnTrackErrorScalingTool.h"
-// using namespace Trk;
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, RIO_OnTrackCreator )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, RIO_OnTrackErrorScalingTool )
 
-DECLARE_FACTORY_ENTRIES(TrkRIO_OnTrackCreator)
-{ // in this package name the following methods are registered 
-  DECLARE_NAMESPACE_TOOL(Trk, RIO_OnTrackCreator)
-  DECLARE_NAMESPACE_TOOL(Trk, RIO_OnTrackErrorScalingTool)
-}
-
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_load.cxx b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_load.cxx
deleted file mode 100755
index 3f1ad1ea8ac28d22d6dfeed85753bb9244c00865..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkRIO_OnTrackCreator)
diff --git a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx b/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx
index 315b94c3db386df7dc8d038efa5e74cf0738ac9e..7b9a2f1c667753262a7051c2a1b5790cb813fe84 100644
--- a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx
+++ b/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "../ResidualPullCalculator.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ResidualPullCalculator )
 
-DECLARE_FACTORY_ENTRIES( TrkResidualPullCalculator )
-{
-	DECLARE_NAMESPACE_TOOL( Trk, ResidualPullCalculator )
-}
-
diff --git a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_load.cxx b/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_load.cxx
deleted file mode 100644
index 29f40227ec82e2e203c837f8d316db100a8e7382..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkResidualPullCalculator )
-
diff --git a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx b/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx
old mode 100755
new mode 100644
index ccaf93515fedf9e0803af4000070377903b2ccc5..008baab5bfa3dfbd4c891dc1429a82d04ed7d849
--- a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx
+++ b/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx
@@ -1,11 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkSegmentConverter/TrkSegmentConverter.h"
 
 using namespace Trk;
 DECLARE_TOOL_FACTORY( TrkSegmentConverter )
 
-DECLARE_FACTORY_ENTRIES( TrkSegmentConverter )
-{
-	DECLARE_TOOL( TrkSegmentConverter )
-}
-
diff --git a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_load.cxx b/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_load.cxx
deleted file mode 100755
index cd30fa8dcc007729be2d84b90c050aa05cd02894..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkSegmentConverter )
-
diff --git a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx b/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx
old mode 100755
new mode 100644
index 9ae284f29047f3ac26057baf8e5e6d6a6571deb1..d0e2fafd9f9e519c0c144c1a489841713f66de25
--- a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx
+++ b/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "../FieldIntegralByTrackQueryTool.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, FieldIntegralByTrackQueryTool )
 
-DECLARE_FACTORY_ENTRIES( TrkTrackFieldIntegralTools )
-{
-	DECLARE_NAMESPACE_TOOL( Trk, FieldIntegralByTrackQueryTool )
-}
-
diff --git a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_load.cxx b/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_load.cxx
deleted file mode 100755
index 9f800b59e0a1ba83e677c40bd20aabc4a140818a..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackFieldIntegralTools )
-
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx b/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx
old mode 100755
new mode 100644
index 95b9b6dd326dcc8a84902adfb7708771a5f77f32..fdde26c731966fde5d59e0608ec1d960424ef788
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx
+++ b/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTrackSlimmingTool/TrackSlimmingTool.h"
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrackSlimmingTool )
 
-DECLARE_FACTORY_ENTRIES( TrkTrackSlimmingTool )
-{
-	DECLARE_NAMESPACE_TOOL( Trk, TrackSlimmingTool )
-}
-
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_load.cxx b/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_load.cxx
deleted file mode 100755
index 7da38cb32e557008fd6fdf935ea658ec80490718..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackSlimmingTool )
-
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx b/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx
old mode 100755
new mode 100644
index 98e9b7093eada3d854e0a15c1a66a5c9e04c1b8f..deface7ef93c1c7fb959e51dacb93a3eeb4732c1
--- a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx
@@ -1,16 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTrackSummaryTool/TrackSummaryTool.h"
 
 using namespace Trk;
 
 DECLARE_TOOL_FACTORY( TrackSummaryTool )
 
-DECLARE_FACTORY_ENTRIES( TrkTrackSummaryTool )
-{
-	DECLARE_TOOL( TrackSummaryTool )
-}
-
-
-
-
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_load.cxx b/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_load.cxx
deleted file mode 100755
index 794a9a546cc0fe4bd3db45c3404b8816b621a851..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackSummaryTool )
-
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx b/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx
old mode 100755
new mode 100644
index 38a0604633e69835cffebde545f272847a549394..e5f7101900e2330e2b3e308be794ac674b4d1b76
--- a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx
+++ b/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTruthCreatorTools/DetailedTrackTruthBuilder.h"
 #include "TrkTruthCreatorTools/ElasticTruthTrajectoryBuilder.h"
 #include "TrkTruthCreatorTools/DecayInFlyTruthTrajectoryBuilder.h"
@@ -11,11 +10,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DecayInFlyTruthTrajectoryBuilder )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TruthMatchRatio )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TruthMatchTanimoto )
 
-DECLARE_FACTORY_ENTRIES( TrkTruthCreatorTools ) 
-{
-  DECLARE_NAMESPACE_TOOL( Trk, DetailedTrackTruthBuilder )
-  DECLARE_NAMESPACE_TOOL( Trk, ElasticTruthTrajectoryBuilder )
-  DECLARE_NAMESPACE_TOOL( Trk, DecayInFlyTruthTrajectoryBuilder )
-  DECLARE_NAMESPACE_TOOL( Trk, TruthMatchRatio )
-  DECLARE_NAMESPACE_TOOL( Trk, TruthMatchTanimoto )
-}
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_load.cxx b/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_load.cxx
deleted file mode 100755
index f75ddd648e0b6e062db000a3512e5df3d26fa15f..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTruthCreatorTools )
-
diff --git a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx b/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx
old mode 100755
new mode 100644
index d4e92baae23ea30fc8d6da1f4e57f30cd9f727dc..b9f2eb31c54b4df10b6df7f04abe19d75df13ab3
--- a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx
+++ b/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
 #define TRUTHTOTRACK_IMP
 #include "TrkTruthToTrack/TruthToTrack.h"
 #include "TrkTruthToTrack/TruthTrackRecordToTrack.h"
@@ -7,7 +5,3 @@
 DECLARE_NAMESPACE_TOOL_FACTORY(Trk, TruthToTrack)
 DECLARE_NAMESPACE_TOOL_FACTORY(Trk, TruthTrackRecordToTrack)
 
-DECLARE_FACTORY_ENTRIES(TrkTruthToTrack) {
-  DECLARE_NAMESPACE_TOOL(Trk, TruthToTrack)
-  DECLARE_NAMESPACE_TOOL(Trk, TruthTrackRecordToTrack)
-}
diff --git a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_load.cxx b/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_load.cxx
deleted file mode 100755
index 109b8cbdcf775ed3d3e62143812bef98274b7935..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkTruthToTrack)
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx
index 91b0aa4ce7343f6683cb583f77d72d2d47c7131b..2d218054ae772ed8953dc4d7a35697c606d1442d 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
 #include "../TruthTrackCreation.h"
 
 using namespace Trk;
@@ -7,7 +5,4 @@ using namespace Trk;
 DECLARE_ALGORITHM_FACTORY(TruthTrackCreation)
 
     
-DECLARE_FACTORY_ENTRIES(TrkTruthTrackAlgs)
-{
-  DECLARE_ALGORITHM(TruthTrackCreation)      
-}
+
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_load.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_load.cxx
deleted file mode 100644
index 7b49af0aad29dd6c963f07e615401f4f585c5f0c..0000000000000000000000000000000000000000
--- a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkTruthTrackAlgs)
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx
index 5f8eb897f09ebc8a5a9804df5e43d3a46210e62a..e335bd87cf70a11f1e9ee005abb04f36e2f10628 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
 #include "../TruthTrackBuilder.h"
 #include "../PRD_TruthTrajectoryBuilder.h"
 
@@ -7,8 +5,4 @@
 DECLARE_NAMESPACE_TOOL_FACTORY(Trk,TruthTrackBuilder)
 DECLARE_NAMESPACE_TOOL_FACTORY(Trk,PRD_TruthTrajectoryBuilder)
     
-DECLARE_FACTORY_ENTRIES(TrkTruthTrackTools)
-{
-    DECLARE_NAMESPACE_TOOL(Trk,TruthTrackBuilder)      
-    DECLARE_NAMESPACE_TOOL(Trk,PRD_TruthTrajectoryBuilder)      
-}
+
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_load.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_load.cxx
deleted file mode 100644
index 025a7d5b6b6410347d1e7c17470708835fb6e469..0000000000000000000000000000000000000000
--- a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkTruthTrackTools)
diff --git a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx
old mode 100755
new mode 100644
index 85fb5b6ad7f9d2f2dd43b4d9f872b49e59083faa..535ed4dee16dce92217cb2e0fc632034df6dce4b
--- a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx
+++ b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkNeuralNetworkUtils/NeuralNetworkToHistoTool.h"
 
 using namespace Trk ;
@@ -6,7 +5,4 @@ using namespace Trk ;
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, NeuralNetworkToHistoTool )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkNeuralNetworkUtils )
-{
-  DECLARE_NAMESPACE_TOOL( Trk, NeuralNetworkToHistoTool );
-}
+
diff --git a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_load.cxx b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_load.cxx
deleted file mode 100755
index a9cd18a521c4165383f200b39b04ea45dda6ca97..0000000000000000000000000000000000000000
--- a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkNeuralNetworkUtils )
-
-
diff --git a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx b/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx
index 633e0ad2f7105f24dcf83439d77521fd3287ec41..d7fc0a34fb6458162c1cd5b6bdcf083457b00120 100644
--- a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx
+++ b/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx
@@ -1,6 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-
 #include "TrkValAlgs/EventDataModelMonitor.h"
 #include "TrkValAlgs/TrackValidationNtupleWriter.h"
 //#include "TrkValAlgs/RecMomentumQualityValidation.h"
@@ -13,12 +10,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SingleTrackDiffAlg )
 //DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, MaterialOnTrackValidation )
 //DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, RecMomentumQualityValidation )
 
-DECLARE_FACTORY_ENTRIES( TrkValAlgs )
-{
-  //    DECLARE_NAMESPACE_ALGORITHM( Trk, EventDataModelMonitor )
-  DECLARE_NAMESPACE_ALGORITHM( Trk, TrackValidationNtupleWriter )
-    DECLARE_NAMESPACE_ALGORITHM( Trk, SingleTrackDiffAlg )
-  //  DECLARE_NAMESPACE_ALGORITHM( Trk, MaterialOnTrackValidation )
-  //  DECLARE_NAMESPACE_ALGORITHM( Trk, RecMomentumQualityValidation )
-
-}
diff --git a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_load.cxx b/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_load.cxx
deleted file mode 100644
index 9c7cc7b3f0fbf42c231fd8b8d70fb7f61f7d43f6..0000000000000000000000000000000000000000
--- a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkValAlgs )
diff --git a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx b/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx
old mode 100755
new mode 100644
index 15293e83347242bc59648b96195d8c6dc5c7d070..d6119e598807bad6981d8d828ea057ec2dcebbcb
--- a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx
+++ b/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx
@@ -21,9 +21,6 @@
 #include "TrkValTools/EventPropertyNtupleTool.h"
 #include "TrkValTools/EventToTrackLinkNtupleTool.h"
 #include "TrkValTools/TrkObserverTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BasicValTrkParticleNtupleTool )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrackInformationNtupleTool )
@@ -49,30 +46,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, EventPropertyNtupleTool )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, EventToTrackLinkNtupleTool )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrkObserverTool )
 
-DECLARE_FACTORY_ENTRIES(TrkValTools)
-{ // in this package name these methods are registered
-  DECLARE_NAMESPACE_TOOL(Trk, BasicValTrkParticleNtupleTool)
-  DECLARE_NAMESPACE_TOOL(Trk, TrackInformationNtupleTool)
-  DECLARE_NAMESPACE_TOOL(Trk, PerigeeParametersNtupleTool)
-  DECLARE_NAMESPACE_TOOL(Trk, MeasurementVectorNtupleTool)
-  DECLARE_NAMESPACE_TOOL(Trk, TrackSummaryNtupleTool)
-  DECLARE_NAMESPACE_TOOL(Trk, DirectTrackNtupleWriterTool)
-  DECLARE_NAMESPACE_TOOL(Trk, ResidualValidationNtupleHelper)
-  DECLARE_NAMESPACE_TOOL(Trk, HitPositionNtupleHelper)
-  DECLARE_NAMESPACE_TOOL(Trk, TrackPositionNtupleHelper)
-  DECLARE_NAMESPACE_TOOL(Trk, DAF_ValidationNtupleHelper)
-  DECLARE_NAMESPACE_TOOL(Trk, EnergyLossMonitor)
-  DECLARE_NAMESPACE_TOOL(Trk, PositionMomentumWriter)
-  DECLARE_NAMESPACE_TOOL(Trk, TrackDiff)
-  DECLARE_NAMESPACE_TOOL(Trk, PrimaryTruthClassifier )
-  DECLARE_NAMESPACE_TOOL(Trk, InDetReconstructableSelector )
-  DECLARE_NAMESPACE_TOOL(Trk, InDetHaloSelector )
-  DECLARE_NAMESPACE_TOOL(Trk, InDetPrimaryConversionSelector )
-  DECLARE_NAMESPACE_TOOL(Trk, TruthNtupleTool )
-  DECLARE_NAMESPACE_TOOL(Trk, GenParticleJetFinder )
-  DECLARE_NAMESPACE_TOOL(Trk, JetTruthNtupleTool )
-  DECLARE_NAMESPACE_TOOL(Trk, EventPropertyNtupleTool )
-  DECLARE_NAMESPACE_TOOL(Trk, EventToTrackLinkNtupleTool )
-  DECLARE_NAMESPACE_TOOL(Trk, TrkObserverTool)
-}
-
diff --git a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_load.cxx b/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_load.cxx
deleted file mode 100755
index fe5f1b25ee036603df5a14f7d0d46b3686343a83..0000000000000000000000000000000000000000
--- a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkValTools)
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx
old mode 100755
new mode 100644
index 121557da2afdafbef5f985ae295a74ca8e4617af..12490cb01028499af9f75aa979b7e81ab502ce89
--- a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx
@@ -1,17 +1,8 @@
 #include "TrkVertexFitterValidationTools/BasicVtxValidationNtupleTool.h"
 #include "TrkVertexFitterValidationTools/TrueTracksNtupleTool.h"
 #include "TrkVertexFitterValidationTools/McEventNtupleTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
 
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BasicVtxValidationNtupleTool )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrueTracksNtupleTool )
 DECLARE_NAMESPACE_TOOL_FACTORY( Trk, McEventNtupleTool )
 
-DECLARE_FACTORY_ENTRIES(TrkVertexFitterValidationTools)
-{ // in this package name these methods are registered
-  DECLARE_NAMESPACE_TOOL(Trk, BasicVtxValidationNtupleTool)
-  DECLARE_NAMESPACE_TOOL(Trk, TrueTracksNtupleTool)
-  DECLARE_NAMESPACE_TOOL(Trk, McEventNtupleTool)
-}
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_load.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_load.cxx
deleted file mode 100755
index 8c5f36a1bd3769e81e902da9a47c6b448e36c4e0..0000000000000000000000000000000000000000
--- a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkVertexFitterValidationTools)
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx
old mode 100755
new mode 100644
index 8e5abdc534daaa102b5cf34792b2e7e333cfa765..ba71ec43d0af41b9c4bed1f126b4e77385e6dec1
--- a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVertexFitterValidationUtils/TrkPriVxPurityTool.h"
 #include "TrkVertexFitterValidationUtils/TrkPriVxPurity.h"
 
@@ -6,7 +5,3 @@ using namespace Trk;
 
 DECLARE_TOOL_FACTORY( TrkPriVxPurityTool )
 
-DECLARE_FACTORY_ENTRIES( TrkVertexFitterValidationUtils ) 
-{
-   DECLARE_TOOL( TrkPriVxPurityTool );
-}
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_load.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_load.cxx
deleted file mode 100755
index 48c0b4627b3d871e367e461d23c8cf1b94ee208a..0000000000000000000000000000000000000000
--- a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexFitterValidationUtils )
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx
old mode 100755
new mode 100644
index 342deb46d7c0dadd43a2479708ef459857e2b567..5854f176bffc5b98a8236b4c301779e11603c2bf
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkJetVxFitter/JetFitterHelper.h"
 #include "TrkJetVxFitter/JetFitterInitializationHelper.h"
 #include "TrkJetVxFitter/JetFitterRoutines.h"
@@ -17,14 +16,3 @@ DECLARE_TOOL_FACTORY( KalmanVertexOnJetAxisUpdator )
 DECLARE_TOOL_FACTORY( TrkDistanceFinderNeutralCharged )
 DECLARE_TOOL_FACTORY( TrkDistanceFinderNeutralNeutral )
 
-
-DECLARE_FACTORY_ENTRIES( TrkJetVxFitter )
-{
-  DECLARE_TOOL( JetFitterHelper )
-  DECLARE_TOOL( JetFitterInitializationHelper )
-  DECLARE_TOOL( JetFitterRoutines )
-  DECLARE_TOOL( KalmanVertexOnJetAxisSmoother )
-  DECLARE_TOOL( KalmanVertexOnJetAxisUpdator )
-  DECLARE_TOOL( TrkDistanceFinderNeutralCharged )
-  DECLARE_TOOL( TrkDistanceFinderNeutralNeutral )
-}
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_load.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_load.cxx
deleted file mode 100755
index 2ed7b08dd17e9e0979dc8d441fbe561cd11a9408..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkJetVxFitter )
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx b/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx
old mode 100755
new mode 100644
index dd71bf7d924af67baac873b98458ee2d9c01b622..3ffbd7bffae72774ae942d5c70c3d99eb586e0bb
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkV0Fitter/TrkV0VertexFitter.h"
 
 using namespace Trk ;
@@ -6,7 +5,4 @@ using namespace Trk ;
 DECLARE_TOOL_FACTORY( TrkV0VertexFitter )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkV0Fitter )
-{
-    DECLARE_TOOL( TrkV0VertexFitter )
-}
+
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_load.cxx b/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_load.cxx
deleted file mode 100755
index 1a8bacc9287ed315359e90077b4dd479be09a012..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkV0Fitter )
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx
old mode 100755
new mode 100644
index ca68fa807d9f908ca413f2c0a6b0c6e66d5f6bd3..3d4e4abf9cb450af2dbd01dec047a1f72a487c4e
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx
@@ -1,19 +1,4 @@
 #include "TrkVKalVrtFitter/TrkVKalVrtFitter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
-using namespace Trk;
+DECLARE_TOOL_FACTORY( Trk::TrkVKalVrtFitter )
 
-DECLARE_TOOL_FACTORY( TrkVKalVrtFitter )
-DECLARE_FACTORY_ENTRIES(TrkVKalVrtFitter) {
-    DECLARE_TOOL( TrkVKalVrtFitter )
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-//   component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-//   by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-//   by the DECLARE_SERVICE() statement.
-// 
-// See Athena User Guide for more information
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_load.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_load.cxx
deleted file mode 100755
index 3c02b88f975e9cc99c07faddc5d9b73d176b10a3..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(TrkVKalVrtFitter)
-  //Notes:
-  //
-  //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
-  //   component library (libXXX.so).
-  //
-  // See Athena User Guide for more information
diff --git a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx
old mode 100755
new mode 100644
index 5ae5e3489e5a445cda329fe5ff99986402f1be93..b9b3a2538cdf3b6829726fe0738c16dc3c0621bb
--- a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVertexAnalysisUtils/V0Tools.h"
 
 using namespace Trk;
 
 DECLARE_TOOL_FACTORY( V0Tools )
 
-DECLARE_FACTORY_ENTRIES( TrkVertexAnalysisUtils )
-{
- DECLARE_TOOL( V0Tools );  
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_load.cxx b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_load.cxx
deleted file mode 100755
index 761c5b8620d510db3af87da7db55c9cb2c239f1b..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexAnalysisUtils )
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx
old mode 100755
new mode 100644
index 116ccaf8e3a9dc075d3ebbeb1cf493975fca9725..c3d19a0b5dedd76dae631a566625463bbbfdf134
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVertexBilloirTools/FastVertexFitter.h"
 #include "TrkVertexBilloirTools/FullVertexFitter.h"
 
@@ -8,8 +7,4 @@ DECLARE_TOOL_FACTORY( FastVertexFitter )
 DECLARE_TOOL_FACTORY( FullVertexFitter )
 
 /** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkVertexBilloirTools )
-{
-    DECLARE_TOOL( FastVertexFitter )
-    DECLARE_TOOL( FullVertexFitter )
-}
+
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_load.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_load.cxx
deleted file mode 100755
index 09d49bce8a5c3a6b99a587bccb0ccae34d23885c..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexBilloirTools )
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx
old mode 100755
new mode 100644
index ed5884b03b3b0d239270b3c06030347132687972..06786b6a9ea80a0828fdda29f877ba1bf7d069f5
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVertexFitterUtils/KalmanVertexUpdator.h"
 #include "TrkVertexFitterUtils/KalmanVertexTrackUpdator.h"
 #include "TrkVertexFitterUtils/FullLinearizedTrackFactory.h"
@@ -24,17 +23,3 @@ DECLARE_TOOL_FACTORY( NeutralParticleParameterCalculator)
 DECLARE_TOOL_FACTORY( TrackToVertexIPEstimator )
 DECLARE_TOOL_FACTORY( Z0PVTrackCompatibilityEstimator )
 
-DECLARE_FACTORY_ENTRIES( TrkVertexFitterUtils )
-{
-    DECLARE_TOOL( KalmanVertexUpdator );  
-    DECLARE_TOOL( KalmanVertexTrackUpdator );
-    DECLARE_TOOL( FullLinearizedTrackFactory );
-    DECLARE_TOOL( DummyAnnealingMaker );
-    DECLARE_TOOL( Chi2TrackCompatibilityEstimator );
-    DECLARE_TOOL( DetAnnealingMaker );
-    DECLARE_TOOL( ImpactPoint3dEstimator );
-    DECLARE_TOOL( NeutralParticleParameterCalculator );
-    DECLARE_TOOL( TrackToVertexIPEstimator );
-    DECLARE_TOOL( Z0PVTrackCompatibilityEstimator );
-}
-
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_load.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_load.cxx
deleted file mode 100755
index 57e39d3db675a490699f74e74e391bac7d4c4e24..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexFitterUtils )
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx
old mode 100755
new mode 100644
index bcbdbe09eeb2784a5aa6ea84f94d057806a60022..0b0362c8258a20f3dd4b4d4fde55f2a9f2f3219a
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVertexFitters/SequentialVertexFitter.h"
 #include "TrkVertexFitters/AdaptiveMultiVertexFitter.h"
 #include "TrkVertexFitters/AdaptiveVertexFitter.h"
@@ -13,11 +12,3 @@ DECLARE_TOOL_FACTORY( SequentialVertexSmoother )
 DECLARE_TOOL_FACTORY( AdaptiveVertexFitter )
 DECLARE_TOOL_FACTORY( DummyVertexSmoother)
 
-DECLARE_FACTORY_ENTRIES( TrkVertexFitters )
-{
-  DECLARE_TOOL( AdaptiveMultiVertexFitter );
-  DECLARE_TOOL(SequentialVertexFitter);
-  DECLARE_TOOL(SequentialVertexSmoother); 
-  DECLARE_TOOL( AdaptiveVertexFitter );
-  DECLARE_TOOL(DummyVertexSmoother );
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_load.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_load.cxx
deleted file mode 100755
index e0f2e3b2adfcd92bd013f6722a1dbc83ffd386b1..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexFitters )
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx
old mode 100755
new mode 100644
index 245940b28975326b541169bb203bc518b65f48ca..7e5ddee5d8f1e11fe14e3cfcf38d69ed96263243
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVertexSeedFinderTools/MCTrueSeedFinder.h"
 #include "TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h"
 #include "TrkVertexSeedFinderTools/DummySeedFinder.h"
@@ -13,11 +12,3 @@ DECLARE_TOOL_FACTORY ( DummySeedFinder )
 DECLARE_TOOL_FACTORY ( ZScanSeedFinder )
 DECLARE_TOOL_FACTORY ( ImagingSeedFinder )
 
-DECLARE_FACTORY_ENTRIES( TrkVertexSeedFinderTools )
-{
-  DECLARE_TOOL( MCTrueSeedFinder );
-  DECLARE_TOOL( CrossDistancesSeedFinder );
-  DECLARE_TOOL( DummySeedFinder );
-  DECLARE_TOOL( ZScanSeedFinder );
-  DECLARE_TOOL( ImagingSeedFinder );
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_load.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_load.cxx
deleted file mode 100755
index ca18e214a03978a5ff3df151079a0c1847ed3e73..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexSeedFinderTools )
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx
index ce00885a25e8ed6c01a3492d420360278a35772c..940def81a841af875b9d3f07132027b155254c16 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h"
 #include "TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h"
 #include "TrkVertexSeedFinderUtils/FsmwMode1dFinder.h"
@@ -25,17 +24,3 @@ DECLARE_ALGORITHM_FACTORY( ImagingSeedTuningAlg )
 
 /** factory entries need to have the name of the package */
 
-DECLARE_FACTORY_ENTRIES( TrkVertexSeedFinderUtils )
-{
-  DECLARE_ALGORITHM( ImagingSeedTuningAlg );
-
-  DECLARE_TOOL( Trk2dDistanceSeeder );
-  DECLARE_TOOL( NewtonTrkDistanceFinder );
-  DECLARE_TOOL( Mode3dTo1dFinder );
-  DECLARE_TOOL( SeedNewtonTrkDistanceFinder );
-  DECLARE_TOOL( FsmwMode1dFinder );
-  DECLARE_TOOL( Trk2DDistanceFinderpwd );
-  DECLARE_TOOL( SimpleVertexClusterFinder );
-  DECLARE_TOOL( LocalMax1DClusterFinder );
-  DECLARE_TOOL( VertexImageMaker );
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_load.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_load.cxx
deleted file mode 100644
index 68db438fc614c9414356c3a9285f7a931702a723..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexSeedFinderUtils )
-
-
-
diff --git a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx
index bf4c522959c75ed7395128b238c4a1602208c8d6..6a2ebcdf86e78a37d4e7f8ae89f72e2c90bffb4d 100644
--- a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
 #include "TrkVertexTools/VertexCollectionSortingTool.h"
 #include "TrkVertexTools/VertexMergingTool.h"
 #include "TrkVertexTools/DummyVertexSelectionTool.h" 
@@ -15,14 +12,7 @@ DECLARE_TOOL_FACTORY(DummyVertexSelectionTool)
 DECLARE_TOOL_FACTORY(TruthVertexSelectionTool)
 DECLARE_TOOL_FACTORY(VertexStoringTool)
     
-DECLARE_FACTORY_ENTRIES(TrkVertexTools)
-{
-  DECLARE_TOOL(VertexCollectionSortingTool)
-  DECLARE_TOOL(VertexMergingTool)
-  DECLARE_TOOL(DummyVertexSelectionTool)
-  DECLARE_TOOL(TruthVertexSelectionTool)
-  DECLARE_TOOL(VertexStoringTool)
-}
  
 
  
+
diff --git a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_load.cxx b/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_load.cxx
deleted file mode 100644
index 55b0bb61776647d6ae9ae611ba04480e22f03da3..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
- 
- LOAD_FACTORY_ENTRIES(TrkVertexTools)
diff --git a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx
index c928f11f643117d3ad598fc7754ac88035d3f113..54980403b10573234c910edb6dc359cbfe3f2d6b 100644
--- a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx
@@ -1,6 +1,3 @@
-
- #include "GaudiKernel/DeclareFactoryEntries.h"
-
  #include "TrkVertexWeightCalculators/SumPtVertexWeightCalculator.h"
  #include "TrkVertexWeightCalculators/VxProbVertexWeightCalculator.h"
  #include "TrkVertexWeightCalculators/NNVertexWeightCalculator.h"
@@ -14,14 +11,3 @@
  DECLARE_TOOL_FACTORY(NNVertexWeightCalculator )
  DECLARE_TOOL_FACTORY(TrueVertexDistanceWeightCalculator)
 
- DECLARE_FACTORY_ENTRIES( TrkVertexWeightCalculators )
- {
-   DECLARE_TOOL(SumPtVertexWeightCalculator)
-   DECLARE_TOOL(VxProbVertexWeightCalculator)
-   DECLARE_TOOL(NNVertexWeightCalculator)
-   DECLARE_TOOL(TrueVertexDistanceWeightCalculator)
-
- }
- 
-
- 
diff --git a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_load.cxx b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_load.cxx
deleted file mode 100644
index db83f06e01e76f690c5609750f86e0e49fe544d4..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
- 
- LOAD_FACTORY_ENTRIES( TrkVertexWeightCalculators )
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
index 9ae46297fc2995af05f7896767918b1f9d6cffb0..44954daaf54951da6bbf1dbb8b0fab0b5abc1257 100644
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkVxEdmCnv/VxCandidateXAODVertex.h"
 
 using namespace Trk;
 
 DECLARE_TOOL_FACTORY( VxCandidateXAODVertex )
 
-DECLARE_FACTORY_ENTRIES( TrkVxEdmCnv )
-{
-  DECLARE_TOOL( VxCandidateXAODVertex )
-}
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_load.cxx b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_load.cxx
deleted file mode 100644
index 8c92336f18f9165f6d0bdfd2a1a0912cbfcf762e..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVxEdmCnv )