diff --git a/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h b/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h
old mode 100755
new mode 100644
index f3443f0cebdc3f944bb924e9146e60438e2f6898..dfb85aa23f4cbe6e37a2aa59d87dcbb6db779bbf
--- a/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h
+++ b/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
@@ -212,5 +212,5 @@ class muCombMT : public AthAlgorithm
    Gaudi::Property<std::vector<double>> m_IDSCANRes_endcap4 {this, "IDSCANEndcap4Res",{0.046, 0.0000002}, "ID parametrized rsolution for matching (ec4)"};
 
 };
-DECLARE_ALGORITHM_FACTORY( muCombMT )
-#endif // MUCOMB_H
+
+#endif // MUCOMBMT_H
diff --git a/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx b/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx
index 9bfa7d9f33fb55dd9b48b3b63ab102a053e8e7ad..20d2a61905eb95594007c22ff3272846c5863110 100644
--- a/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx
@@ -1,5 +1,6 @@
 #include "TrigmuComb/muComb.h"
-
+#include "TrigmuComb/muCombMT.h"
 
 DECLARE_COMPONENT( muComb )
+DECLARE_COMPONENT( muCombMT )
 
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h
index 4065cf10c1f63233fdb4081a0152f0e130fc6e43..f45b818722cb6986b90af2cd19fcdec881eb8bec 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h
@@ -42,5 +42,4 @@ class TestTrigL2CaloHypoAlg : public ::AthReentrantAlgorithm {
 
 }; 
 
-DECLARE_ALGORITHM_FACTORY( TestTrigL2CaloHypoAlg )
 #endif //> !TRIGEGAMMAHYPO_TESTTRIGL2CALOHYPOALG_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h
index 6f5dbde141f2b0cd18b9b203e67fbd89e4641c5b..f54e207a3da1d4a6b7e458e21001f62a7461e672 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h
@@ -58,5 +58,5 @@ class TestTrigL2CaloHypoToolInc : public extends<AthAlgTool, ITrigL2CaloHypoTool
   
   int findCutIndex( float eta ) const;
 }; 
-DECLARE_TOOL_FACTORY( TestTrigL2CaloHypoToolInc )
+
 #endif //> !TRIGEGAMMAHYPO_TESTTRIGL2CALOHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h
index ca2db5bba32d63b85b54d70707d56dcee7703140..634de146acf15488e6ed6313a0fb5dac0702661c 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h
@@ -42,5 +42,4 @@ class TrigL2CaloHypoAlg : public ::AthReentrantAlgorithm {
  
 }; 
 
-DECLARE_ALGORITHM_FACTORY( TrigL2CaloHypoAlg )
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOALG_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h
index fb5e6ca38151e6d461bf83351a12098b3b1cdb10..f1e966110da7362bf90c8740a5db904be7375925 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h
@@ -55,5 +55,5 @@ class TrigL2CaloHypoToolInc : public extends<AthAlgTool, ITrigL2CaloHypoTool> {
   
   int findCutIndex( float eta ) const;
 }; 
-DECLARE_TOOL_FACTORY( TrigL2CaloHypoToolInc )
+
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h
index b282b2081d2cadd3282798c3f7b3807dd70c564a..0dd3817a3a4423f546db5eeb761f2ded84a7cdf7 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h
@@ -43,5 +43,5 @@ class TrigL2CaloHypoToolMult : public extends<AthAlgTool, ITrigL2CaloHypoTool> {
   ToolHandleArray<ITrigL2CaloHypoTool> m_subTools { this, "SubTools", {}, "Sub tools performing cuts" };
   
 }; 
-DECLARE_TOOL_FACTORY( TrigL2CaloHypoToolMult )
+
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOTOOLMULT_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h
old mode 100755
new mode 100644
index 81143c20b09a4f94c18394939ac8cc297009ea35..782dc0f7177c6247d8b12c76ac38e24f0d91a91f
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h
@@ -131,5 +131,5 @@ class TrigL2ElectronFexMT : public AthAlgorithm  {
   ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
   
 };  
-DECLARE_ALGORITHM_FACTORY( TrigL2ElectronFexMT )
+
 #endif
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h
index 98bf7f5e23da1b740c25bb1f32d438f1f1163d80..daaa7f6e78ef8566a3ef9cee112adc3894eb3e35 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h
@@ -44,6 +44,5 @@ class TrigL2ElectronHypoAlg
   SG::ReadHandleKey< xAOD::TrigElectronContainer > m_electronsKey {this, "Electrons", "L2ElectronContainer", "Input"};
 
 }; 
-DECLARE_ALGORITHM_FACTORY( TrigL2ElectronHypoAlg )
 
 #endif //> !TRIGEGAMMAHYPO_TRIGL2ELECTRONHYPOALG_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h
index 5169c3a379917e62dba65bea9639eb05455e3f52..b3933e8f505187ae2d7f03fad8f091f39e89fd35 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h
@@ -87,5 +87,4 @@ class TrigL2ElectronHypoTool : virtual public ::AthAlgTool
   ToolHandle<GenericMonitoringTool> m_monTool{ this, "MonTool", "", "Monitoring tool" };
 }; 
 
-DECLARE_TOOL_FACTORY( TrigL2ElectronHypoTool )
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
index 5e36b304f29d9e60808e977e64d52b52e24d51f8..ff4b4ec3d7346a0438072cb1b16f8242a5b93308 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
@@ -11,9 +11,13 @@
 #include "TrigEgammaHypo/TrigEFElectronHypo.h"
 #include "TrigEgammaHypo/TrigEFPhotonHypo.h"
 #include "TrigEgammaHypo/TrigEFTrackHypo.h"
-#include "TrigEgammaHypo/TrigL2PhotonFex.h"
 #include "TrigEgammaHypo/TrigL2CaloLayersHypo.h"
-
+#include "../TestTrigL2CaloHypoAlg.h"
+#include "../TestTrigL2CaloHypoToolInc.h"
+#include "../TrigL2CaloHypoAlg.h"
+#include "../TrigL2CaloHypoToolInc.h"
+#include "../TrigL2CaloHypoToolMult.h"
+#include "../TrigL2ElectronFexMT.h"
 
 DECLARE_COMPONENT( TrigL2CaloHypo )
 DECLARE_COMPONENT( TrigL2ElectronFex )
@@ -29,8 +33,9 @@ DECLARE_COMPONENT( TrigEFElectronHypo )
 DECLARE_COMPONENT( TrigEFPhotonHypo )
 DECLARE_COMPONENT( TrigEFTrackHypo )
 DECLARE_COMPONENT( TrigL2CaloLayersHypo )
-
-
-
-
-
+DECLARE_COMPONENT( TestTrigL2CaloHypoAlg )
+DECLARE_COMPONENT( TestTrigL2CaloHypoToolInc )
+DECLARE_COMPONENT( TrigL2CaloHypoAlg )
+DECLARE_COMPONENT( TrigL2CaloHypoToolInc )
+DECLARE_COMPONENT( TrigL2CaloHypoToolMult )
+DECLARE_COMPONENT( TrigL2ElectronFexMT )
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
old mode 100755
new mode 100644
index 40f01101f0f4527523c6d75a958d3515c330a21d..90d0773ad7aa90b2be01337894136b543a44b7e0
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
@@ -56,5 +56,4 @@ class TrigMufastHypoAlg
 	this, "L1Decisions", "", "Name of the input decisions object produced by MuFastSteering"};
 };
 
-DECLARE_ALGORITHM_FACTORY( TrigMufastHypoAlg )
 #endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
old mode 100755
new mode 100644
index 1aa64ca4cc9dd2937ebf25496ef380553e3c4f2b..e97824dae3bebc3db870ed1ed438aedf218a5c04
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
@@ -83,5 +83,4 @@ class TrigMufastHypoTool: public ::AthAlgTool {
     ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };   
 };
 
-DECLARE_TOOL_FACTORY( TrigMufastHypoTool )
 #endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
old mode 100755
new mode 100644
index b44551aeae580addf07fc26269190220be326345..aa9654aa7238373e22b364f4eef9cdadcabf3f5d
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
@@ -56,5 +56,4 @@ class TrigMuonEFMSonlyHypoAlg
 	this, "L1Decisions", "MuonEFMSonly_Decisions", "Name of the input decisions object"};
 };
 
-DECLARE_ALGORITHM_FACTORY( TrigMuonEFMSonlyHypoAlg )
 #endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h
index eea0d889edf5e3d2a7d122ef1aa738314db423eb..6401c6023344d20744937f22517dad96ccfb94c4 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h
@@ -57,5 +57,4 @@ class TrigMuonEFMSonlyHypoTool: public ::AthAlgTool {
   ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
 };
 
-DECLARE_TOOL_FACTORY(TrigMuonEFMSonlyHypoTool)
 #endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
index bbc027928bd17120e3ffcbcb13e46d319bc1c845..164342b77b3ce7d3304c8600e112fdc7373c47d6 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
@@ -54,5 +54,4 @@ class TrigmuCombHypoAlg
 	this, "MuonL2CBInfoFromMuCombAlg", "MuonL2CBInfo", "Name of the input data produced by muCombMT"};
 };
 
-DECLARE_ALGORITHM_FACTORY( TrigmuCombHypoAlg )
 #endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h
index ddfadbbe1f6a4bd16a54087fae92f315a389f305..948a727fe7b7d6f964423887f8b395cff516bec3 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h
@@ -78,5 +78,4 @@ class TrigmuCombHypoTool: public ::AthAlgTool {
     std::vector<float>::size_type m_bins;
 };
 
-DECLARE_TOOL_FACTORY( TrigmuCombHypoTool )
 #endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
index c59937b9e2827343c0d772608eac5119fb1f3ade..dcf6c8742979fe4984ab2993ee418ba4857c671e 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
@@ -7,6 +7,10 @@
 #include "TrigMuonHypo/MucombHypo.h"
 #include "TrigMuonHypo/MucombStauHypo.h"
 #include "TrigMuonHypo/MuisoHypo.h"
+#include "TrigMuonHypo/TrigMufastHypoAlg.h"
+#include "TrigMuonHypo/TrigMufastHypoTool.h"
+#include "TrigMuonHypo/TrigmuCombHypoAlg.h"
+#include "TrigMuonHypo/TrigmuCombHypoTool.h"
 #include "TrigMuonHypo/TrigMooreHypo.h"
 #include "TrigMuonHypo/TrigMuonEFSegmentFinderHypo.h"
 #include "TrigMuonHypo/TrigMuonEFTrackBuilderHypo.h"
@@ -30,6 +34,8 @@
 #include "TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h"
 #include "TrigMuonHypo/TrigMuonEFCombinerDiMuonMassHypo.h"
 #include "TrigMuonHypo/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.h"
+#include "TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h"
+#include "TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h"
 #include "TrigMuonHypo/TrigMuonCaloTagHypo.h"
 #include "TrigMuonHypo/TrigMuonIDTrackMultiHypo.h"
 
@@ -42,6 +48,10 @@ DECLARE_COMPONENT( MufastCALHypo )
 DECLARE_COMPONENT( MucombHypo )
 DECLARE_COMPONENT( MucombStauHypo )
 DECLARE_COMPONENT( MuisoHypo )
+DECLARE_COMPONENT( TrigMufastHypoAlg )
+DECLARE_COMPONENT( TrigMufastHypoTool )
+DECLARE_COMPONENT( TrigmuCombHypoAlg )
+DECLARE_COMPONENT( TrigmuCombHypoTool )
 DECLARE_COMPONENT( TrigMooreHypo )
 DECLARE_COMPONENT( TrigMuonEFSegmentFinderHypo )
 DECLARE_COMPONENT( TrigMuonEFTrackBuilderHypo )
@@ -65,6 +75,8 @@ DECLARE_COMPONENT( MufastNSWHypo )
 DECLARE_COMPONENT( TrigMuonEFExtrapolatorNSWHypo )
 DECLARE_COMPONENT( TrigMuonEFCombinerDiMuonMassHypo )
 DECLARE_COMPONENT( TrigMuonEFCombinerDiMuonMassPtImpactsHypo )
+DECLARE_COMPONENT( TrigMuonEFMSonlyHypoAlg )
+DECLARE_COMPONENT( TrigMuonEFMSonlyHypoTool )
 DECLARE_COMPONENT( TrigMuonCaloTagHypo )
 DECLARE_COMPONENT( TrigMuonIDTrackMultiHypo )