diff --git a/Generators/GeneratorFilters/src/DecayModeFilter.cxx b/Generators/GeneratorFilters/src/DecayModeFilter.cxx
index 70d789ea3828aa446a26f6c3e3e506f01f8d2ed2..131ad4b321b7d807e4321e32aa936b0ec3e5fff0 100644
--- a/Generators/GeneratorFilters/src/DecayModeFilter.cxx
+++ b/Generators/GeneratorFilters/src/DecayModeFilter.cxx
@@ -122,7 +122,6 @@ StatusCode DecayModeFilter::filterEvent() {
       // Look for initial vertex
       if ((*vtx_iter)->particles_in_size() != 2) continue;
       if ((*vtx_iter)->particles_out_size() < 2) continue;
-      //if ((*vtx_iter)->point3d().x()==0 && (*vtx_iter)->point3d().y()==0 && (*vtx_iter)->point3d().z()==0) continue;
       HepMC::GenVertex::particles_out_const_iterator outParticle = (*vtx_iter)->particles_out_const_begin();
       HepMC::GenParticle* parent1 = *outParticle;
       HepMC::GenParticle* parent2 = *(++outParticle);
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
index 1a40179f6fb11a1589c90012a990a337ff4808f0..b704dc72e000648dd3f9cd5f8553c71679079f63 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
@@ -2917,7 +2917,6 @@ IDStandardPerformance::MakeTrackPlots(const DataVector<Trk::Track>* trks,
 
   //int nparticle=0;
   for (unsigned int ievt=0; ievt<nb_mc_event; ++ievt){
-    //const HepMC::GenEvent* genEvent = *(gen->begin());
     const HepMC::GenEvent* genEvent = SimTracks->at(ievt);
 
     int nprimperevent=0;
@@ -3024,15 +3023,11 @@ IDStandardPerformance::MakeTrackPlots(const DataVector<Trk::Track>* trks,
       m_truthvtx_R->Fill(truthvtx_R);
       m_truthvtx_z->Fill(primaryVtx.z());
 
-      //HepGeom::Point3D<double>  startVertex(particle->production_vertex()->point3d().x(),
-      //particle->production_vertex()->point3d().y(),
-      //particle->production_vertex()->point3d().z());
       Amg::Vector3D  startVertex(particle->production_vertex()->point3d().x(),particle->production_vertex()->point3d().y(),particle->production_vertex()->point3d().z());
       // Detector paper cuts: impact parameter <2 and barcode reasonable
       // JFA (Sep 18, 2008): replace IP cut by cut on difference between primary and track start vertex
       // If (startVertex.perp()>2) isPrimary=false;
       // JFA (Feb. 2, 2009): Replace cut on difference between IP and startvertex by a cut on truth d0
-      //if (genEvent->signal_process_vertex() != 0 && primaryVtx.distance(startVertex) > 2.0) isPrimary=false;
       if (!singPart && fabs(truth_d0corr) > 2.0) isPrimary=false;
       if (particle->barcode()>MAXBARCODE || particle->barcode()==0) isPrimary=false;
       isDetPaperCut=isPrimary;
@@ -3047,9 +3042,6 @@ IDStandardPerformance::MakeTrackPlots(const DataVector<Trk::Track>* trks,
       if (reDefGenPhi<0) reDefGenPhi+=2*m_Pi;
 
       if (particle->end_vertex() != 0) {
-	//HepGeom::Point3D<double>  endVertex(particle->end_vertex()->point3d().x(),
-	//particle->end_vertex()->point3d().y(),
-	//particle->end_vertex()->point3d().z());
 
 	Amg::Vector3D  endVertex(particle->end_vertex()->point3d().x(),
 			      particle->end_vertex()->point3d().y(),
@@ -3063,7 +3055,6 @@ IDStandardPerformance::MakeTrackPlots(const DataVector<Trk::Track>* trks,
 	// Look only for particles interacting inside the ID
 	if(endVertex.perp()<1000 && fabs(endVertex.z())<2500)  {
 	  //log<< MSG::ERROR << "****** Particle with end vertex inside ID ******" << endmsg;
-	  //log << MSG::ERROR<<"PdgCode="<<particle->pdg_id() << ", status=" << particle->status()<< ", barcode=" << particle->barcode()<< ", E = "<< particle->momentum().e()/1000<< ", m = "<< particle->momentum().m()/1000<< ", pT = "<< particle->momentum().perp()/1000<< ", eta = "<<particle->momentum().pseudoRapidity()<< ", phi = "<<particle->momentum().phi()<< ", stavtx = "<<startVertex.perp()<< ", endvtx = "<<endVertex.perp()<< endmsg;
 
 	  // First iteration: Flag if nuclear interaction
 
@@ -3080,7 +3071,6 @@ IDStandardPerformance::MakeTrackPlots(const DataVector<Trk::Track>* trks,
 		{
 		  n_out++;
 		}
-	      //log << MSG::ERROR <<"PdgCode="<<(*child)->pdg_id() << ", status=" << (*child)->status() << ", barcode=" << (*child)->barcode()	<< ", E = "<< (*child)->momentum().e()/1000<< ", m = "<< (*child)->momentum().m()/1000<< ", pT = "<< (*child)->momentum().perp()/1000<< ", eta = "<< (*child)->momentum().pseudoRapidity() << ", phi = "<<particle->momentum().phi()<< ", stavtx = "<<(*child)->production_vertex()->point3d().perp()<< endmsg;
 	      mass_final += (*child)->momentum().m()/1000;
 	    }
 	  }
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
index f81504f8783e80378d1036d2e1aa9469b8c2740b..e6692d79ed50bb09caf3d9d3f36778710523dfb6 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
@@ -334,7 +334,6 @@ StatusCode SingleTrackValidation::execute() {
     Point3D<double>       origin(theParticle->production_vertex()->point3d().x(),
 			    theParticle->production_vertex()->point3d().y(),
 			    theParticle->production_vertex()->point3d().z()); 
-    //HepMC::GenVertex *decayVertex = theParticle->end_vertex();
     double           charge = theParticle->pdg_id() > 0 ? particleData->charge() : - particleData->charge();
     // Put Eta and Phi into the Ntuple
     m_c->phi = theParticle->momentum().phi();
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/MuonCalibAlg.cxx b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/MuonCalibAlg.cxx
index bb7b172e177f1cd16421ba4d8e1a9e0ed0707b5f..b1c0071b18cf47a850536414de668ebe5681ed1b 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/MuonCalibAlg.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/MuonCalibAlg.cxx
@@ -508,12 +508,10 @@ namespace MuonCalib {
 		pos[1] = (*particle)->production_vertex()->point3d().y();
 		pos[2] = (*particle)->production_vertex()->point3d().z();
 	      }
-	      //.x(),(*particle)->production_vertex()->point3d().y(), (*particle)->production_vertex()->point3d().z() );
 	      Amg::Vector3D mom( (*particle)->momentum().x(), (*particle)->momentum().y(), (*particle)->momentum().z() );
 	      double kinEnergy( p[3] ) ;
 	      int PDGCode( (*particle)->pdg_id() ) ;
 	    
-	      //	    std::cout << " MuonCalibAlg TruthEvent Muon BARCODE for Event Collection " << (*particle)->barcode() << " energy " <<  kinEnergy << " code " << PDGCode << " pos x " << pos[0] << " pos y " << pos[1] << " pos z " << pos[2] <<std::endl;
 	      MuonCalibTruth* truth = new MuonCalibTruth();
 	    
 	      truth->setPosition(pos);
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
index 3b1a4caa510ea1756d910e1e278857829d4a7632..3ab935bcc97c1b5a01493f82262c7cb686b21c0c 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
@@ -792,12 +792,6 @@ std::string MuonTrackPerformanceAlg::print( const Muon::IMuonTrackTruthTool::Tru
     if( mother )  {
       sout << " mother " << mother->pdg_id();
 
-
-      // if( mother->end_vertex() ) sout << " vertex: r  " << mother->end_vertex()->point3d().perp() 
-      //   			      << " z " << mother->end_vertex()->point3d().z();
-
-      // const HepMC::GenParticle* original = getInitialState(*trackTruth.truthTrajectory);
-      // if( original ) sout << "  p:  " << original->momentum().rho();
     }
   }
 
diff --git a/Tracking/TrkTools/TrkTruthToTrack/src/TruthToTrack.cxx b/Tracking/TrkTools/TrkTruthToTrack/src/TruthToTrack.cxx
index 5e3b802d25ab4a8866f2e1944069a9eb273edd3e..7f9dd987d190104d4a8c2f1841bced0082f7e0a5 100755
--- a/Tracking/TrkTools/TrkTruthToTrack/src/TruthToTrack.cxx
+++ b/Tracking/TrkTools/TrkTruthToTrack/src/TruthToTrack.cxx
@@ -80,7 +80,6 @@ const Trk::TrackParameters* Trk::TruthToTrack::makeProdVertexParameters(const He
     if(pd) {
       // pd could point to an antiparticle. recover the sign:
       double charge = (id>0) ? pd->charge() : -pd->charge();
-      //      Trk::PlaneSurface surface(new HepGeom::Translate3D(part->production_vertex()->point3d()));
       Amg::Translation3D tmpTransl(hv);
       Amg::Transform3D tmpTransf = tmpTransl * Amg::RotationMatrix3D::Identity(); 
       Trk::PlaneSurface surface(new Amg::Transform3D(tmpTransf));
@@ -113,7 +112,6 @@ const Trk::TrackParameters* Trk::TruthToTrack::makeProdVertexParameters(const xA
     if(pd) {
       // pd could point to an antiparticle. recover the sign:
       double charge = (id>0) ? pd->charge() : -pd->charge();
-      //      Trk::PlaneSurface surface(new HepGeom::Translate3D(part->production_vertex()->point3d()));
       Amg::Translation3D tmpTransl(hv);
       Amg::Transform3D tmpTransf = tmpTransl * Amg::RotationMatrix3D::Identity(); 
       Trk::PlaneSurface surface(new Amg::Transform3D(tmpTransf));
diff --git a/Tracking/TrkValidation/TrkValTools/src/InDetPrimaryConversionSelector.cxx b/Tracking/TrkValidation/TrkValTools/src/InDetPrimaryConversionSelector.cxx
index 01e08d734b2db973b0cd7428bd38177e961cf877..9a3748b8bb41c3a020fe853c5cd693118756d60b 100644
--- a/Tracking/TrkValidation/TrkValTools/src/InDetPrimaryConversionSelector.cxx
+++ b/Tracking/TrkValidation/TrkValTools/src/InDetPrimaryConversionSelector.cxx
@@ -82,10 +82,6 @@ Trk::InDetPrimaryConversionSelector::selectGenSignal (const McEventCollection* S
       // 1) require stable particle from generation or simulation
       if ((particle->status()%1000) != 1 )    continue;
 
-//    HepGeom::Point3D<double>  startVertex(particle->production_vertex()->point3d().x(),
-//                             particle->production_vertex()->point3d().y(),
-//                             particle->production_vertex()->point3d().z());
-//     if ( fabs(startVertex.perp()) > m_maxRStartPrimary || fabs(startVertex.z()) > m_maxZStartPrimary) continue;
       if(particle->production_vertex() == NULL) {
         ATH_MSG_WARNING ("GenParticle without production vertex - simulation corrupt? ");
         ATH_MSG_DEBUG   ("It's this one: " << *particle);
diff --git a/Tracking/TrkValidation/TrkValTools/src/InDetReconstructableSelector.cxx b/Tracking/TrkValidation/TrkValTools/src/InDetReconstructableSelector.cxx
index f5433d7511133714ed6fffdb75c0a7630a95bfd3..ef31b115dd69786a796cc9e31c56824557e8b807 100644
--- a/Tracking/TrkValidation/TrkValTools/src/InDetReconstructableSelector.cxx
+++ b/Tracking/TrkValidation/TrkValTools/src/InDetReconstructableSelector.cxx
@@ -88,10 +88,6 @@ Trk::InDetReconstructableSelector::selectGenSignal (const McEventCollection* Sim
       // 1) require stable particle from generation or simulation
       if ((particle->status()%1000) != 1 )    continue;
 
-//    HepGeom::Point3D<double>  startVertex(particle->production_vertex()->point3d().x(),
-//                             particle->production_vertex()->point3d().y(),
-//                             particle->production_vertex()->point3d().z());
-//     if ( fabs(startVertex.perp()) > m_maxRStartPrimary || fabs(startVertex.z()) > m_maxZStartPrimary) continue;
       if(particle->production_vertex() == NULL) {
         ATH_MSG_WARNING ("GenParticle without production vertex - simulation corrupt? ");
         ATH_MSG_DEBUG   ("It's this one: " << *particle);
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h
index ab4c5ba7481697850e50b39fab56b8625c707da5..d30880c5de9c8a23d5107d86cbfe87a8c6ef02d5 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h
@@ -441,24 +441,6 @@ public:
     
     double pT  = q*track->pt();
 
-    //// BP this is slightly confusing, since d0 =? a0?,
-    //// ToolHandle<Trk::ITruthToTrack> truthToTrack;
-    //// const HepMC::GenParticle* particle = track->genParticle();
-    //// const HepMC::GenParticle* gp = track->genParticle();
-    //// boost::scoped_ptr<const Trk::TrackParameters> generatedTrackPerigee( truthToTrack->makePerigeeParameters(particle) );
-    //// const Trk::TrackParameters* generatedTrackPerigee(0);
-    //// cout<<"BP BP here "<<endl;
-    //// if ( gp->production_vertex() ){
-    ////   cout<<"BP BP gp->production_vertex() "<<endl;
-    ////   generatedTrackPerigee = truthToTrack->makePerigeeParameters( gp );
-    ////   if (generatedTrackPerigee == NULL && gp->barcode() > 1000000 ) {
-    ////      std::cout<<"BP No perigee available for interacting truth particle."<<std::endl;
-    ////   }
-    //// }
-
-    //// generatedTrackPerigee = truthToTrack->makePerigeeParameters( gp );
-    //// cout<<"BP BP "<<generatedTrackPerigee->parameters()[Trk::d0]<<endl;
-    //// double d0 = generatedTrackPerigee ? generatedTrackPerigee->parameters()[Trk::d0] : 999.;
 
     double d0  = 0;
 
@@ -509,12 +491,6 @@ public:
     /// the production vertex? or swim the track to the perigee point with respect 
     /// to 0,0 and use the parameters there? 
 
-    /// const HepMC::GenParticle* gp = track->genParticle();
-    /// const HepMC::GenVertex*   gv = gp->production_vertex();
-
-    ////    double x0 = gv->point3d().x();
-    ////    double y0 = gv->point3d().x();
-    ////    double z0 = gv->point3d().z();
 
     /// what to do with these???
 		
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
index d94314a439f976ff7f5b02bfb3429ca1d37f2c30..dd4a24050be2e89518718bc8d5f07745c701f12b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
@@ -494,12 +494,6 @@ TIDA::Track* TrigTrackSelector::makeTrack( const TruthParticle* track, unsigned
     /// the production vertex? or swim the track to the perigee point with respect 
     /// to 0,0 and use the parameters there? 
 
-    /// const HepMC::GenParticle* gp = track->genParticle();
-    /// const HepMC::GenVertex*   gv = gp->production_vertex();
-
-    ////    double x0 = gv->point3d().x();
-    ////    double y0 = gv->point3d().x();
-    ////    double z0 = gv->point3d().z();
 
     /// what to do with these???
 		
diff --git a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
index 5abdc945a74aaf70da17e20293edda70f83c912d..39537356151b3a0689d82a37a4de0612b31377e8 100755
--- a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
+++ b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
@@ -90,20 +90,6 @@ FakeLvl1RoIfromKine::FakeLvl1RoIfromKine(const std::string& name, const std::str
   declareProperty( "FakeJetRoiLabel",  m_jetRoiLabel ="JET20");
   declareProperty( "FakeTauRoiLabel",  m_tauRoiLabel ="HA10");
 
-  //  HepMC::IO_PDG_ParticleDataTable pdg_io("PDGTABLE");
-  //pdg_io.fill_particle_data_table(&m_particleDataTable);
-  //m_particleDataTable.make_antiparticles_from_particles();
-  //if (m_particleDataTable.empty()) {
-  //  m_log << MSG::WARNING << "failed to find PDG table" << std::endl;
-  //}
-
-  //  HepMC::IO_PDG_ParticleDataTable pdg_io("PDGTABLE");
-  //pdg_io.fill_particle_data_table(&m_particleDataTable);
-  //m_particleDataTable.make_antiparticles_from_particles();
-  //if (m_particleDataTable.empty()) {
-  //  m_log << MSG::WARNING << "failed to find PDG table" << std::endl;
-  //}
-
 }
 
 // DESTRUCTOR:
@@ -299,16 +285,6 @@ std::vector<FakeRoI> * FakeLvl1RoIfromKine::createRoIfromMC() {
 
     int pdgid= (*p)->pdg_id();
 
-    //int abs_pdgid = abs(pdgid);
-    //     HepMC::ParticleData* ap = m_particleDataTable.find( abs_pdgid );
-    //if(!ap) { qq=0.; } else { qq = ap->charge(); }
-    //if (qq !=0) { // charged particle, use the signed PDG code to find charge
-    //  HepMC::ParticleData* pp  = m_particleDataTable.find( pdgid );
-    //  if (!pp) { qq = 0; } else { qq =  pp->charge(); }
-    // }
-
-    // EMROI
-
     std::vector<int>::iterator emParticle=m_emTauRoiParticles.begin();
     std::vector<int>::iterator lastEmParticle=m_emTauRoiParticles.end();
     bool formEmTauRoi=false;
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx
index e7f0e523ba66f584f0916eb5ab4dfe831313573b..70edeb9e5d5b802b28fd4a96d171899f3ff850ec 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx
@@ -83,8 +83,6 @@ void AscObj_TruthPoint::buildShapes(SoSeparator*&shape_simple, SoSeparator*&shap
   else
   {
 	  // Eigen migration
-//    p1 = Trk::GlobalPosition(m_d->genVertex->point3d().x(),m_d->genVertex->point3d().y(),m_d->genVertex->point3d().z());
-//    u = Trk::GlobalMomentum(m_d->genParticle->momentum().px(),m_d->genParticle->momentum().py(),m_d->genParticle->momentum().pz()).unit();
     p1 = Amg::Vector3D(m_d->genVertex->point3d().x(),m_d->genVertex->point3d().y(),m_d->genVertex->point3d().z());
     u = Amg::Vector3D(m_d->genParticle->momentum().px(),m_d->genParticle->momentum().py(),m_d->genParticle->momentum().pz()).unit();
   }
@@ -131,8 +129,6 @@ QStringList AscObj_TruthPoint::clicked()
       return l;
     }
 
-//    Trk::GlobalPosition p(m_d->genVertex->point3d().x(),m_d->genVertex->point3d().y(),m_d->genVertex->point3d().z());
-//    Trk::GlobalMomentum mom(m_d->genParticle->momentum().px(),m_d->genParticle->momentum().py(),m_d->genParticle->momentum().pz());
     Amg::Vector3D p(m_d->genVertex->point3d().x(),m_d->genVertex->point3d().y(),m_d->genVertex->point3d().z());
     Amg::Vector3D mom(m_d->genParticle->momentum().px(),m_d->genParticle->momentum().py(),m_d->genParticle->momentum().pz());