diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigEFRazorAllTE.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigEFRazorAllTE.h
index 6c1afd4a6d85740f7bc03ab9ea70666526815b97..1281f3c32f15c0eb40b85fa4f4ab301d1734fe48 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigEFRazorAllTE.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigEFRazorAllTE.h
@@ -103,10 +103,6 @@ class TrigEFRazorAllTE : public HLT::AllTEAlgo {
   double m_p[2];
   double m_dot;
 
-  //IHistogramSvc* m_histsvc;
-
-  StoreGateSvc*                           m_storeGate;
-
   // Timing:
 
   ITrigTimerSvc*            m_timersvc;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypo2.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypo2.h
index e1ebc95ad7adf37d9aaac056481ec85585a55091..ceb142cc2f3699a4c261e062498a926d7482ddcb 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypo2.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypo2.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TRGHLTJETHYPO2_H
-#define TRIGHLTJETHYPO2_H
+#ifndef TRIGHLTJETHYPO_TRIGHLTJETHYPO2_H
+#define TRIGHLTJETHYPO_TRIGHLTJETHYPO2_H
 /********************************************************************
  *
  * NAME:     Trighltjethypo2.h
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h
index 4866806cbddd1ed046061a51ab0715b59c06b7d1..ffd4b7a8e95124ae40cb7594814a253d1821fb8e 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h
@@ -56,9 +56,9 @@ class CleanerFactory{
  private:
 
   //run 1 cleaning
-  double m_n90Threshold;
-  double m_presamplerThreshold;
-  double m_negativeEThreshold;
+  //double m_n90Threshold;
+  //double m_presamplerThreshold;
+  //double m_negativeEThreshold;
   
   //loose cleaning
   double m_fSampMaxLooseThreshold;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CleanerFactory.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CleanerFactory.cxx
index ff336369b5d11762de60a6bd68713bf56ae0fd12..57afb1320aeaf3a24a7ac0204459a23c6ea240b7 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CleanerFactory.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CleanerFactory.cxx
@@ -42,9 +42,9 @@ std::shared_ptr<ICleaner> makeEtaEtCleaner(double etaMin,
 
 
 CleanerFactory::CleanerFactory(//basic cleaning
-			       double n90Threshold,
-			       double presamplerThreshold,
-			       double negativeEThreshold,
+			       double /*n90Threshold*/,
+			       double /*presamplerThreshold*/,
+			       double /*negativeEThreshold*/,
 			       //loose cleaning
 			       double fSampMaxLooseThreshold,
 			       double etaLooseThreshold,
@@ -64,9 +64,9 @@ CleanerFactory::CleanerFactory(//basic cleaning
 			       double hecqLlpThreshold,
 			       double avLarQFLlpThreshold,
 			       const std::string& key):
-  m_n90Threshold(n90Threshold),
-  m_presamplerThreshold(presamplerThreshold),
-  m_negativeEThreshold(negativeEThreshold),
+  //m_n90Threshold(n90Threshold),
+  //m_presamplerThreshold(presamplerThreshold),
+  //m_negativeEThreshold(negativeEThreshold),
   m_fSampMaxLooseThreshold(fSampMaxLooseThreshold),
   m_etaLooseThreshold(etaLooseThreshold),
   m_emfLowLooseThreshold(emfLowLooseThreshold),