diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
index e4d8b0e5e6b0011ebe3f7035e4a344b22fa58dc8..23d4ba221e8d4cf7308a62b8864198facc748e02 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 #include "AthenaKernel/CLASS_DEF.h"
 
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
index b5980d77385a4634e9dfa95f85056072c9159bc8..2e22a908c6ea336180c9667a39307f03f156458d 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
@@ -17,7 +17,6 @@
 // STL includes
 #include <vector>
 
-// HepMC / CLHEP includes
 
 #include "AthenaKernel/CLASS_DEF.h"
 
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
index 0110ff06d3858b2b254b4ba0c8b2c62e68cea959..5a877430c1396c3ee62f8dc1c3aa9ff4488cbebe 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 #include "AthContainers/DataVector.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h b/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h
index aa440a721d0c600c1a0364875dcc38c6e3b6da6c..09ea1925efdef596fee852c9e73d77cec8ab7e53 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h
@@ -21,7 +21,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h b/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h
index e6268cc545714bc6a853c9287cd4a648a9b7b1ba..9254884c8417bbf8f346887e8d816a35ab1a42ef 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h
@@ -22,7 +22,6 @@
 #include <string>
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h b/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h
index 3b314f440c8d0129aeffc0bb8bf9f7d0c67bcafd..13e25d1783d3b79d9e496a7a310dbd8dbcae246f 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h
@@ -30,7 +30,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "GaudiKernel/ServiceHandle.h"
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h
index a35479755d99e63054f578c01aea37f058175a80..3fa80e501fbb7145179ffa8cb9c232e6b1100363 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h
index 96ed7d7ecb05f6731bd9ddd8733302dd7f2a0347..bfbc74f582216d29fce2ab319b7e318f955652b3 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h
index 68e948d75af5b285bf073ce194dafd8089aa9222..55d2240621cc28fcf52237056dc5b08087f344d6 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h
index e8470826c004864665e23589f465a14287dc1022..8970ee3b35b06469a902eb6c5e0b0b650bcb4ba6 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h b/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
index 9ca6b90996f1937f66ba90a0ab0f7e8da20e527c..484e63c02ed413388586074d786d15d4b0e8191c 100644
--- a/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
+++ b/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
@@ -10,7 +10,6 @@
 // STL includes
 #include <iosfwd>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "GaudiKernel/IService.h"
diff --git a/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h b/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h
index 61305473bbf1572014fa815d5edeeb3d8836d2dd..9ee010e7b47e8ec297b806d0ea0755202c32192e 100755
--- a/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h
+++ b/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "GaudiKernel/IInterface.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h
index 6240868e1af3a2942944f8c801f98d75e140fead..74e93fee1bf00b4c988cb3a6a1ee616d5fad584f 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h
@@ -16,7 +16,6 @@
 #include <vector>
 #include <utility> // for std::pair
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h
index 04356bfbafd37c00dd57268062dcc6191e339eba..f899fbd4b019cbf3ecc4ef1acb9e0cae0e23384b 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h
@@ -16,7 +16,6 @@
 #include <list>
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h
index 85fe476e6ca51c295193ea1d435c462d75fa85ae..6e16112d8890b8005911f79186a039be4d24c47c 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h
@@ -16,7 +16,6 @@
 #include <list>
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h
index b7802ddc2116a4da35161a64ebb52219309052e0..7e26754a09a86749ac004d46ed96c2db0ffa137c 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h
index 607356de6e4ba46a666a6ae66fa6720a4347ed35..594552f5c1c55fcfd236275cc13a4ab3f4e47155 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h
@@ -16,7 +16,6 @@
 #include <list>
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h
index e045fa6545a6db68135fce09c6594bc1278663b7..5971e1b56b270b1ce78856835054fe9f3b3b9fb9 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h b/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
index 6ca8008517eab0736498eb63125ac0eee9c473fa..b432c3a3d712c0787d9f5782427aa4efc5c72a03 100644
--- a/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
+++ b/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
@@ -18,7 +18,6 @@
 #include <set>
 #include <fstream>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthService.h"
diff --git a/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h b/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h
index 947e6e1ca668641085f1e88ca9bdbb8fa23f7e23..b581eca9bf9b19b4cb4b88a7a947f60c17cf9707 100755
--- a/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h
+++ b/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h
@@ -18,17 +18,7 @@
 #include "AtlasSealCLHEP/CLHEP_Random.h"
 #include "AtlasSealCLHEP/CLHEP_Geometry.h"
 #include "AtlasSealCLHEP/CLHEP_Matrix.h"
-// #include " AtlasSealCLHEP/CLHEP_Vector.h "
-// #include " AtlasSealCLHEP/CLHEP_Random.h "
-// #include " AtlasSealCLHEP/CLHEP_Geometry.h "
-// #include " AtlasSealCLHEP/CLHEP_Matrix.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Vector.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Random.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Geometry.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Matrix.h "
-// #include " AtlasSealCLHEPDict/CLHEP_HepMC.h "
-// #include " AtlasSealCLHEPDict/CLHEP_HepPDT.h "
-// #include " AtlasSealCLHEPDict/CLHEP_GenericFunctions.h "
+
 
 #include "AtlasSealCLHEP/OldCLHEP.h"
 #include "AtlasSealCLHEP/OldCLHEPStreamers.h"
diff --git a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
index b3ac2d7e8173477abd968d72612d034dbfb1e696..e19986c430e8810ce03fc1c8649e1243ba72ec75 100755
--- a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
+++ b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
@@ -15,7 +15,6 @@
 #include <string>
 #include <iosfwd>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Event/EventCommonAlgs/src/I4MomDumper.h b/Event/EventCommonAlgs/src/I4MomDumper.h
index 093e3b4258c810e8a1c6952db9778322a15e55a8..8043507d0f40ef08e65f968f783b77c272b78ef9 100644
--- a/Event/EventCommonAlgs/src/I4MomDumper.h
+++ b/Event/EventCommonAlgs/src/I4MomDumper.h
@@ -15,7 +15,6 @@
 #include <string>
 #include <iosfwd>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h
index f2e30ff393d7b43e18c1736be536baf64925c4e5..848001301c32bf38ae2fb6126f1422993ea18515 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h
@@ -13,7 +13,7 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
+// CLHEP includes
 #include "CLHEP/Vector/LorentzVector.h"
 
 // Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h
index 7df1e0a3d4512f1734a5a9f56bd1fc52d09e0778..2593d8e38ecf7a1e7442acee8148f42702db6c9f 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 // Forward declaration
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h
index 43a8be9e8f28103b81fbe29edc485c0c721774d6..e8a010caae43de8a635ac657cdb4b3b2a60ffaad 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h
index 4ea58ed1a3c028bd3a15ae8267f60a6db8b05cf8..fd124832a727271370090dec039389237285e226 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h
index 135e2a593ea503bf1999d0a4cf3958ee9c679a93..70e3e6835cf549b4c4f24f3b76659f2fbe0cd53c 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h
index c26ff79da9d21d2fd70ef70864821078e8dc55a2..8e79c0b007f28984dc72ed2121f723477575db98 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h
@@ -16,7 +16,6 @@
 #include <vector>
 #include <utility>
 
-// HepMC / CLHEP includes
 
 // Forward declaration
 class INav4MomAssocsCnv_p1;
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h
index 46daeef55e076cf8f2817891dd02c54552e3d920..4e6a0ade2e0a23e777300a32c6879a719a7fe8a1 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h
@@ -21,7 +21,6 @@
 #include "DataModelAthenaPool/ElementLink_p2.h"
 #include "DataModelAthenaPool/ElementLinkContNames_p2.h"
 
-// HepMC / CLHEP includes
 
 // Forward declaration
 class INav4MomAssocsCnv_p2;
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h
index 429c5b1d578dbc41fd503b432acda82671498549..55f9726bc9f26837f05343bf9880239366658a74 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h
index 7eff516ce80e9380bfeb4d840890ab5fa633c53f..4014a5c97e2e5152ec39c0f1a96d335e5e426176 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h
index a7cfd5e5505174b741852ef58ced9dc083abb66b..4761627cf474bf60099e50f8c5825c7b5b26373e 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h
index 65735a01ab4591a4bce2611dc53f96efbd4dbe49..62fbc6d45c6219bd05805c594e15ff7a33360b1c 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h
index 457c2cc5d9cd7862717061c10daf08a3a061b09e..8ee370f4476d50be1a079f1edb7445ac973a811d 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h
index 197dc809addb82d98259fad90c9abae0d921067c..7e5bdace7259ef7fa4c8bc7161cf060685626f59 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h
index 9e570310722da8e96be49fcb0ee3e9183ac377df..0d6bc558fd4c55c7759ae497304d7f9eb01a585b 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h
index 179aeacd5a2feea132c08aae0cc4e71f9d28aa64..8c134d4bdd7216e2324a188d84c2ce6542f644e8 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h
index 0cf9c0e155221fc8ab0b260494d89780323eb147..5a5757c09889436a5868027573262d53ab7c4fad 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h
index de0ebb7a58d2a151086e2f9e9fb07b70f95788d6..db7b7a528a2e8924c9ea4d263bb3aa15f3f05a85 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h
index f035cd730a3bc013202b3145597b8645c4a789e3..b21b8c100c0985d94ab324a446a30b8dff174066 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h
index e798983d6d9841857d8fcbf82fbda9e4a653dd0e..3862a69b1b3c4159ccdf9bf44f5cdee1ba124cda 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h
index a5c473bef1ff0495e44f8c731cfd571808da6950..534ee0ead4fe462a48f0411723e97dd1776cbae9 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h
index 4122a5eff5b4f205d401ff67af01b820444ddde6..3b9cae22981404a5ce30f34ac45d1b09f1f322af 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h
index 43c806d5e1d0fa0ea330a6d863eceeef587914b0..cc418244ffc865d68f1c1129aa58203c44a5a81f 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h
index 17eeb5276461d20055bc9012945aaff15742f87f..8aaf8f116ad652a721bc44850daedbe2162d638d 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h
index b390cceaf992101cb287af2de8a0c3f514ade2d6..c7f0d4063a873d493c33314dfd5c8ae8b6b7c82b 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h
index cd7059960ecb2331a96caf6a6b0bbba4fe1a2f1e..c6a6ca4edc0bd12c2d9fb65c9f3fc381edb7005d 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h b/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h
index 7c6ffc1b0a32108a35fc2b97e9c86be24d02e923..59f426f4b119460d614062e714a9cbed0b779f72 100755
--- a/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h
+++ b/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h
@@ -18,7 +18,7 @@
 #include <ostream>
 #include <iomanip>
 
-// HepMC / CLHEP includes
+//  CLHEP includes
 #include "CLHEP/Vector/LorentzVector.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 
diff --git a/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h b/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h
index 9d729ff2c1dbc7eb6b849f433afecc58da173905..8a872443dff60874220462cb20ce914c27d1e8a1 100755
--- a/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h
+++ b/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h
@@ -13,7 +13,7 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
+//  CLHEP includes
 #include "CLHEP/Vector/LorentzVector.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 
diff --git a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
index 0277588caff568d23259027cec7cd98f228eff4f..e87553b03b735dd2a6dcf29f41816fa9bf4dd0b5 100644
--- a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
+++ b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
@@ -13,7 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Framework includes
 #include "AthenaKernel/CLASS_DEF.h"
diff --git a/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h b/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h
index b9833242cfd934151df0fcd0809106e3717b5a24..950386055560624e5a4990f949226b36e9c2eb63 100644
--- a/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h
+++ b/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h
@@ -13,7 +13,7 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
+//  CLHEP includes
 #include "CLHEP/Vector/LorentzVector.h"
 
 // Gaudi includes
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h
index 205464adc538b93273d699246ac300124de544ac..da943a5b6102a7ad295dda66d3d2e3b83f5af3b1 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h
@@ -17,7 +17,6 @@
 // STL includes
 #include <list>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h
index e0eabe20fe242a43d963bc65b27594296ef6e445..84cf243458c004e1369268441227ff7dd5552f80 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h
@@ -14,7 +14,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h
index 99ec50234fffce51e48ecc02d1f478def3325cda..d7c4c6899f742a45dfb2bbee5254684c52aee1fc 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h
index 5d70c92a04c0e44bab21da5d67a09f3e1c1e873c..c2c7c6713f8a471f0e6b05f508ca60ca8e7a0cce 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <vector>
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 // Forward declaration
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h
index c25ab5e3df1875bf1b5b8704b961e9645ff6d9da..164e9b8ad65b59d8607c46444687a8339d5aeb71 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h
index eb6827b3c78dbc785033e0394d5a04b22eebe06f..ea58e1a1f3474123edfe3720a0c4c3a3a5c8b22e 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h
index 9de537d9b161f9c643fcad864b5a1a36c27c7c9e..7a1a37cf4aa819732e96cd907a46334022161148 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <vector>
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h
index 473957d7818cd3d7653fec2bfa3c9b99441202c9..eeb07ca52012106ea600b15aff1ab79c82981220 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h
@@ -12,8 +12,6 @@
 #define GENERATOROBJECTSTPCNV_MCEVENTCOLLECTIONCNV_P1_H
 
 // STL includes
-
-// HepMC / CLHEP includes
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h
index d286f8a0a0215d17a78410cccc3e8b06f8b28db4..884eef9f735934e882545765e7f528f157a0c14d 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <unordered_map>
 
-// HepMC / CLHEP includes
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h
index c8f96383057b33d1d3c17d29755e140c3115bf76..18d1b96ae80fd7c6614285db4c88fadb1c388e1d 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <unordered_map>
 
-// HepMC / CLHEP includes
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h
index cad48a5b7c386902918cac61b53a86e1280a5258..c7c9372fa22558e5b064a1a5ab37cb87239c15c3 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <unordered_map>
 
-// HepMC / CLHEP includes
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/Pythia8B_i/src/Pythia8B_i.cxx b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
index 4a35810a68d8e93e92b89cfc67224e2eaebc0b33..8104add9e995660ab2319fe7ec321cee22364d90 100644
--- a/Generators/Pythia8B_i/src/Pythia8B_i.cxx
+++ b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
@@ -357,8 +357,6 @@ StatusCode Pythia8B_i::fillEvt(HepMC::GenEvent *evt){
     evt->set_event_number(*(m_internalEventNumbers.begin()));
     m_pythiaToHepMC.fill_next_event(pyev, evt, 1);
     
-    // fill the pdf information
-    //m_pythiaToHepMC.put_pdf_info(evt, m_pythia, false);
     
     // set the randomseeds
     if(useRndmGenSvc() && Pythia8B_i::p_AtRndmGenSvc)
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
index 5ba699e2e3688ec6362ee6b1218d6a25adee314f..364d4f1fa5db3cc1628da5615cbe310278d49c93 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
@@ -178,8 +178,6 @@ StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,Cs
       TimedHitPtr<CSCSimHit> phit(*i++);
       const CSCSimHit& hit(*phit);
 
-      //      const HepMcParticleLink McLink = HepMcParticleLink(phit->trackNumber(),phit.eventId());
-      //      const HepMC::GenParticle* genPart = McLink.cptr(); // some times empty pointer returned
 
       ATH_MSG_DEBUG(hit.print());
 
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h
index e1bc98798b38effd3cfd221333c1c6ce0a750bbb..29deb456b8ff517a548b214b5a5e24d851edb91e 100755
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h
@@ -20,7 +20,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 #include "AthenaKernel/getMessageSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h
index 16c6db6d7b74257175a64db369299b9c7641da5d..3f287f61dfa5a3ac4adef5f7e947a294df66e16d 100755
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h
@@ -20,7 +20,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 
 // Gaudi includes
 
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h
index 5809b8ecfad76075ce2b59c24d09cf3ece5321ce..ea1ecff5738a6095db4d9e652ddd0d1b73fef5e0 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h
@@ -25,8 +25,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h
index 8d51fcca922ac3c6368ab83a28164ffd6d190e12..d672f4a24804213422c59e86ccc3536106f9acaf 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
index 98d9876183b9109ee435f9934b538be1f2094a8c..e04cb8af9afc80b4564cb48aab29fdf6082619de 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
@@ -15,8 +15,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
index 33fcf821647aefefe6794903e622f7cf22dfda32..7f5f1cc4b9703cc6c80e824ad9d0b5086716b382 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
@@ -16,7 +16,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h
index 4004e4f08639e6ce913612af58dea8f99ceba71f..395869f943d451a89979d1d3eb4a286243d09a38 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h
@@ -21,7 +21,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
 #include "HepPDT/ParticleData.hh"
 
 // Gaudi includes
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h
index f450bea8484c4f0d94d3ed3ef6ab33c483a7c69c..d7aaff38e379ac388055b3b3dd0d2e84d7430989 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
 
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h b/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h
index 0ab8b89156621c56f1850ebe41f5c20cbc7723b2..0bb177d68b4267b645a65025fb95b34fb0240232 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <iosfwd>
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 // EventKernel includes
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h
index f5c3f3189a5b998c3ca887a6922a40279894d70f..0d75f516f5f11229183203df733250bee85a754c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 #include "AthLinks/ElementLink.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h
index dd4be4cc48b18d6fdf34f2344c9cc017efe94338..a23c46fd8e852c5e4cd06bcd5149981cd9e5b947 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 #include "AthLinks/ElementLink.h"
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
index 761a119220c3aa5818395c899e1e167499cd2d5f..1f0c67e8a4bbb911230302ffe71f17cf199ed8cc 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
index c9486470f515cbd0e0c0e5b0b5ca326426c5d335..68f107428830f4e21eff79c68499b0bcd66e01f4 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
@@ -15,7 +15,6 @@
 #include <string>
 #include <iosfwd>
 
-// HepMC / CLHEP includes
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
index be139191894ed8f85c20d9856fd37e124b6185a5..5c260ffb81b57c48d8e4f039ad60fe277da0979f 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // AssociationUtils includes
 #include "DeltaROverlapFilter.h"
 
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h
index 140653d9d4f91f0636aab87071ce6fc08671386f..dacaafb8c32b1d8d2d38baf27343f943bf4f4ce6 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx
index 00662d50388bd23abafc9e7f11cb1c910c91f79a..6aa5810ce1ac1bd7a10c565231dbaec3782b6ac3 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx
@@ -221,7 +221,6 @@ StatusCode SiHitFillerTool::fill (const SiHit& /*hit*/)
   *m_energyLoss=1.0;
   *m_meanTime=1.0;
   *m_trackNumber=1.0;
-  //const HepMcParticleLink & 	particleLink () const
   *m_isPixel=1;
   *m_isSCT=1;
   *m_BarrelEndcap=1;
@@ -230,15 +229,11 @@ StatusCode SiHitFillerTool::fill (const SiHit& /*hit*/)
   *m_PhiModule=1;
   *m_Side=1; 
 
-  //const HepMcParticleLink& mcLink = hit.particleLink();
   *m_truthbarcode2 = 1;
 
-  //const HepMC::GenParticle* genPart= mcLink.cptr();
-  //if(genPart){
+
    *m_truthbarcode = -999;
-   //}else{
-   //*m_truthbarcode=-999;
-   //}
+
 
   return StatusCode::SUCCESS;
 }
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx
index c350a51f390bf35facda8f8b0c47c3469991872a..56e557ef131c451e9ab6157c77778f469301d04d 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx
@@ -109,19 +109,15 @@ StatusCode D3PD::TRTUncompressedHitFillerTool::fill (const TRTUncompressedHit& /
   *m_globalTime       = 1.0;
 
   // resolve global position
-  //GeoTRTUncompressedHit ghit(hit);
-  //const HepGeom::Point3D<double>& globalPos = ghit.getGlobalPosition();
   *m_globalPosX = 1.0;
   *m_globalPosY = 1.0;
   *m_globalPosZ = 1.0;
   *m_globalPosR = 1.0;
 
   // particle barcode2 directly from TRTUncompressedHit
-  //const HepMcParticleLink& mcLink = hit.particleLink();
   *m_truthbarcode2    = -999;
 
   // particle barcode from associated GenParticle
-  //const HepMC::GenParticle* genPart = mcLink.cptr();
   *m_truthbarcode = -999;
 
   return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx
index 11e9f269c3c0e085355abd6e594fbaeef00601ef..de5ab92dfef4bb78d274bf7ebebf14802c7b9049 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx
@@ -13,8 +13,6 @@
 
 // FrameWork includes
 
-// HepMC includes
-
 // McParticleKernel includes
 #include "McParticleKernel/IIOHepMcTool.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h
index 5a0e457108cb153778e14a1f6506db8ba2cdd411..96dcb83d5354747acee54bd88b527fd15dd698ff 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx
index 8588a212f5ecb20648ee76e690ef4deefe5eebe1..8fe3182ed3f22b35b86f74b78a8dcbacc69d3474 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx
@@ -13,8 +13,6 @@
 
 // FrameWork includes
 
-// HepMC includes
-
 // McParticleKernel includes
 #include "McParticleKernel/IIOHepMcTool.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h
index eda1181e69c634ba3bbf78dd52f3948ed186101b..706e0bf63aa8e8af5860ac0e3f9e0f892f2e8415 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx
index 12dbfaef54f53b3e4e13f3fa51bea0495e35af59..b9fe44995e0e720ea2fde9471a8ce96b949cfd39 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx
@@ -13,8 +13,6 @@
 
 // FrameWork includes
 
-// HepMC includes
-
 // McParticleKernel includes
 #include "McParticleKernel/IIOHepMcTool.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h
index 7edb4f2208980d247d4ae0eb73d9da51c1f5f5e1..b101bd0334c1c3ddbff176e418399756674f2ca7 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx
index 401ddffcd6a45c02f3e1646fd17ffbc9c9552a8e..2c63fd28b078ced7117d0d4bbe5320920a3a019a 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx
@@ -13,8 +13,6 @@
 
 // FrameWork includes
 
-// HepMC includes
-
 // McParticleKernel includes
 #include "McParticleKernel/IIOMcAodTool.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h
index c549b1e471b15ed804be051d7a3670166a497fd5..31ddb42f9e4ee8f027ecd5c2de2964b76ff85543 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h
index 6799479726ce5a8fecf9a9119a260ff66a3b0d58..31e61137b6a9b4849dd3882911a3490cdc2e141c 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
index 285438c5a3f6b6ad7d9288341f021fe8714c91b2..fac5893c80db47a16abaf6a4a6b5d886645978f7 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h
index 23e5f01c1189998c7d0293196ebedca0cf9e554d..e63b7c8b35e86bfd368044ff3065aff76ace63a2 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 // Navigation includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
index e6681817dde9ce48f59706fbf76873b370006f9e..3a1e3cf3758ce2ac8279dd323002e773cbd1a8c2 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
@@ -15,7 +15,7 @@
 #include <iomanip>
 #include <stdexcept>
 
-// HepMC / CLHEP includes
+// CLHEP includes
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "AtlasHepMC/GenParticle.h"
 #include "AtlasHepMC/GenEvent.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx
index d1a09ef0a762fc0dfb85ada2ae7a5221fb126dca..a781df015e47be248d91a1cc1631a3a56d2e011f 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx
@@ -13,7 +13,7 @@
 #include <sstream>
 #include <string>
 
-// HepMC / CLHEP includes
+// HepMC includes
 #include "AtlasHepMC/GenParticle.h"
 #include "AtlasHepMC/GenEvent.h"
 #include "AtlasHepMC/GenVertex.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h
index be42c389645bcc76dc3cb6047d02426ea5902fbb..b37e9c998287437b9c9cbcea8a3c42b8d8e6f885 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <stdexcept>
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 #include "GaudiKernel/MsgStream.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
index 2bd9a828b03c9f70e5292c96bac7fb78c5adc7c3..1d20686874393eefe06c77f274a984c47daad6a3 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
@@ -97,7 +97,6 @@ RootTruthParticleCnvTool::convert(const McEventCollection *mcCollection,
                "TruthParticle is not wrapping the GenParticle : %d !!",
                hepMcPart->barcode());
     }
-    //bcToMcPart[ hepMcPart->barcode() ] = mcPart;
     HepMcParticleLink mcLink( hepMcPart->barcode(), genEventIndex );
     bcToMcPart[ mcLink.compress() ] = mcPart;
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h
index a6cdcfe74f7854409636ffb0c75669ad9c96da35..cf28e5fce4830a8a3cc496510b9908d2abbbfc74 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h
@@ -12,8 +12,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
 #include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h
index 8852b1cb634227e88ffb2cf1c1f84cdfc8312e52..b101586f67562c7338a0f34dd51d3af2c4b43a00 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h
@@ -12,8 +12,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
 #include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h
index b9d59ba94b6a1069452894ca88f445f8c4888b1a..865214ba71d0c5da7ce6404ffeee8ebc2ffa4e01 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h
@@ -12,8 +12,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
 #include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h
index 8b758fb39927e5468b88041216833d910a4bf6c0..d4c21570a212c1e0f915ea9d490123edd607f1e4 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h
@@ -21,8 +21,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
 #include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h
index 5431bb565cd9f0aa41822f9afcf7c77d58ae2697..283b5bdc179881a938d98bf5dcb518335e064093 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h
@@ -12,8 +12,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
 #include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h
index bc2b3a9530fd6c45aadc5068d1b347861b937277..d764ee12843e78333e3e21c71a3b4a1e03dd8be8 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h
@@ -24,8 +24,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"
 #include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h
index 3269e6845c259b7ba806b7d25060c85c3608d73b..ce44ecd8d925d967ed9f2a93b5d47fd4cad97bd7 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h
@@ -21,8 +21,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // Gaudi includes
 
 // Forward declaration
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
index 65c5c85c94962a850b614357dd00a91d0bbebb09..f5afc0967de0f547c08a52f86f32ece49e7a1a63 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
@@ -14,7 +14,7 @@
 
 // FrameWork includes
 
-// CLHEP/HepMC includes
+// CLHEP includes
 #include "TruthHelper/IsGenerator.h"
 #include "TruthHelper/IsGenStable.h"
 #include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
index 55f83f51d4440d741c8c95e74300beaa589b3f3f..4a16c00d7351d0d7c3d9f70221213d803146f114 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
@@ -15,8 +15,6 @@
 #include <string>
 #include <map>
 
-// HepMC / CLHEP includes
-
 // McParticleUtils includes
 #include "McParticleUtils/McVtxFilter.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
index 693dfdcb11c11468b312532d5a4e1ee87ec1e93b..4aadf20744b7990c271a9501c82067d23a2d8803 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
@@ -18,7 +18,6 @@
 
 // FrameWork includes
 
-// CLHEP/HepMC includes
 #include "GeneratorObjects/McEventCollection.h"
 #include "HepPDT/ParticleDataTable.hh"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
index ddaba03d6e4c96635a23242794d0dba1166ab2cc..fd07363a58ca37329613a43e62f94884c074f8b1 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
@@ -20,7 +20,7 @@
 // ROOT includes
 #include "TTree.h"
 
-// CLHEP/HepMC includes
+// CLHEP includes
 #include "GeneratorObjects/McEventCollection.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
index 235c2a7db9f9f756d535aafdd886ff480797c794..3d68a1119fd7620a7efeac2560e868108fb0bebd 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
@@ -14,7 +14,6 @@
 // FrameWork includes
 #include "GaudiKernel/Property.h"
 
-// CLHEP/HepMC includes
 #include "TruthHelper/IsGenStable.h"
 #include "TruthHelper/IsGenInteracting.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h
index 27c10eb322c6dbf8c04bca4d8547d6fbfc4a6a68..fc54cd23d339b963c021b61d4fd4a565195b7cc9 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
-
 // McParticleTools includes
 #include "TruthParticleFilterBaseTool.h"
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
index 49810b68fa1cf02796fe99c98f07320cad198c65..80d91b85fb6a53c2a9d93b48c0ddae1b8e62b174 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <set>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 
 // McParticleTools includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
index 8ad07feb65210502c16f30d923c29915a32c9fe2..c85af4414047068082ffc083bd1e5fd1324f9688 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
@@ -14,8 +14,6 @@
 // STL includes
 #include <set>
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 
 // McParticleTools includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
index b1dac4acf4c16650751160c9e155a33301f6fe58..22aaea78e70970b51db28113d648e98f93271c07 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
@@ -13,7 +13,6 @@
 
 // FrameWork includes
 
-// CLHEP/HepMC includes
 #include "GeneratorObjects/McEventCollection.h"
 
 // McParticleEvent includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h
index cb6cb4108deb472f0ca65519cf86452fa8027d38..a288a56bde02dee02b86ddb354431c27a8e9717b 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h
@@ -14,7 +14,6 @@
 // STL includes
 #include <string>
 
-// HepMC / CLHEP includes
 #include "GeneratorObjects/McEventCollection.h"
 
 // FrameWork includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx
index b968eba8197f2d9b2294163493ac6033c9ffc43d..85ffeb9354257f91eebc51b3175c8bff3ee4de38 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx
@@ -13,7 +13,6 @@
 
 // FrameWork includes
 
-// CLHEP/HepMC includes
 #include "GeneratorObjects/McEventCollection.h"
 
 // McParticleTools includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h
index 811ce052b2702d073fe1eb509a7c7993fc6eb127..ee1cc9c0405ab1e3bea9713644314ea6b624dfff 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h
@@ -15,7 +15,6 @@
 #include <string>
 #include <map>
 
-// HepMC / CLHEP includes
 
 // McParticleUtils includes
 #include "McParticleUtils/McVtxFilter.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h b/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h
index 0b31016b43efb5e7de5bb1c5a3689dab068c2ba3..66ab90b66fa92f14bd8e22b3f699eb04d7b44928 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC includes
-
 // Forward declaration
 namespace HepPDT  { class ParticleDataTable; }
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx b/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx
index 7670d5a96fa2eed3f55382cc190d509edf215311..df558cdbecc58c8d32276af30f965b4284514979 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx
@@ -21,7 +21,6 @@
 #include "GaudiKernel/IPartPropSvc.h"
 #include "GaudiKernel/ServiceHandle.h"
 
-// CLHEP/HepMC includes
 #include "HepPDT/ParticleData.hh"
 #include "HepPDT/ParticleDataTable.hh"
 
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h b/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h
index 97a43d160447a4605899075b825969d20d1d41ac..e0871449ea8c19a3221e1b5d471cfc8c0ba403cf 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h
+++ b/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "AsgTools/IAsgTool.h"
 
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx
index 5a4d85728666caf4f2fb73ddff2844b0a92e487c..ea06f0aa03c0238c5300f4c25be1e31aeb0aa73e 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx
@@ -155,11 +155,6 @@ void NewMergeMcEventCollTool::printDetailsOfMergedMcEventCollection(McEventColle
     std::ofstream of(fname);
     (*outputEventItr)->print(of); // verbose output
     of.close();
-    //      HepMC::GenEvent& currentSignalEvent(**(outputEventItr));
-    //      currentSignalEvent.print();
-    //      ATH_MSG_INFO ( "Current signal_process_vertex: " );
-    //      if(0!=currentSignalEvent.signal_process_vertex()) currentSignalEvent.signal_process_vertex()->print();
-    //      else ATH_MSG_INFO ( "signal_process_vertex is NULL" );
     ++outputEventItr;
   }
   ATH_MSG_INFO ( "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" );
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx
index 285388c01cc904ef0b9f6eee9ff2bea1904b7537..9bc8b15e63b005faa6b64978cbee1d9cf878fd82 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx
@@ -168,11 +168,6 @@ void SimpleMergeMcEventCollTool::printDetailsOfMergedMcEventCollection(McEventCo
       std::ofstream of(fname);
       (*outputEventItr)->print(of); // verbose output
       of.close();
-      //      HepMC::GenEvent& currentSignalEvent(**(outputEventItr));
-      //      currentSignalEvent.print();
-      //      ATH_MSG_INFO ( "Current signal_process_vertex: " );
-      //      if(0!=currentSignalEvent.signal_process_vertex()) currentSignalEvent.signal_process_vertex()->print();
-      //      else ATH_MSG_INFO ( "signal_process_vertex is NULL" );
       ++outputEventItr;
     }
   ATH_MSG_INFO ( "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" );
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h b/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h
index a5959c9b12de1813f7728b9e80015dda04f65ef2..b282c5e15d7ef3aaf09fca4397438c2fb2edff80 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h
@@ -13,8 +13,6 @@
 
 // STL includes
 
-// HepMC / CLHEP includes
-
 // FrameWork includes
 #include "GaudiKernel/IAlgTool.h"