diff --git a/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h b/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h
index 607f1471ba455c3828825c28c3f33eaacbf4b1d9..adb04d5c4fca0a69c87aa202d37e6735446ffb9f 100644
--- a/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h
+++ b/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h
@@ -1,9 +1,9 @@
-// Dear emacs, this is -*- c++ -*-
-
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
+// Dear emacs, this is -*- c++ -*-
+
 // $Id: JetTrigAuxContainer_v2.h 2017-02-12 16:52 sschramm $
 #ifndef XAODJET_VERSIONS_JETTRIGAUXCONTAINER_V2_H
 #define XAODJET_VERSIONS_JETTRIGAUXCONTAINER_V2_H
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx
index 159d9ca2f28e8b4270154171c3ae074df9b570ff..b9b4d1ec5be9b1cb03087f32e0007a2216ca7771 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx
@@ -69,12 +69,6 @@ persToTrans( const xAOD::JetTrigAuxContainer_v1* oldObj,
    }
    newInt.setStore( newObj );
 
-   /** THIS IS WHERE CONVERSION CAN BE DONE IF NEEDED
-
-       E.g. you might want to create an empty vector of ElementLinks for the new branch.
-
-    **/
-
    std::vector< std::vector< ElementLink< xAOD::IParticleContainer > > > GhostTrack;
 
    // Print what happened:
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h
index ef90c8a007402184091a13224e0e7360134fecc7..d74f97186ed41564984eab2f95f763c389bf7831 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h
@@ -1,9 +1,9 @@
-// Dear emacs, this is -*- c++ -*-
-
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
+// Dear emacs, this is -*- c++ -*-
+
 // $Id: xAODJetTrigAuxContainerCnv_v1.h 797270 2017-02-15 00:03:55Z khoo $
 #ifndef XAODJETATHENAPOOL_XAODJETTRIGAUXCONTAINERCNV_V1_H
 #define XAODJETATHENAPOOL_XAODJETTRIGAUXCONTAINERCNV_V1_H
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h
index eb4e86b05ed8e389363e1d42af325bbc1c6b3459..3af19261ff9c327db53942d08b91baeb525eeec7 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h
@@ -61,14 +61,6 @@ class TrigHLTJetRecBase: public HLT::FexAlgo {
                                       LabelIndex* indexMap,
                                       PseudoJetVector& pjv_secondary);
 
-  /*virtual HLT::ErrorCode retrieveSecondaryPseudoJetGetter();
-  
-  virtual HLT::ErrorCode getSecondaryPseudoJets(HLT::TriggerElement* inputTE,
-                               LabelIndex* indexMap,
-                               PseudoJetVector& pjv);
-  virtual HLT::ErrorCode loadSecondaryPseudoJets(
-                               PseudoJetVector& pjv);
- */
   ToolHandle<ITriggerPseudoJetGetter>  m_secondarypseudoJetGetter; // a secondary pseudojet getter (for e.g. ghost association)
   std::string  m_secondarylabel; // to label secondary pseudojets
   //