diff --git a/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc b/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc
index c4ac70123c101..78fd65b070e93 100644
--- a/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc
+++ b/SimG4Core/CustomPhysics/src/ToyModelHadronicProcess.cc
@@ -2,7 +2,6 @@
 #include "G4ProcessManager.hh"
 #include "G4ParticleTable.hh"
 #include "G4Track.hh"
-#include "G4InelasticInteraction.hh"
 #include "Randomize.hh"
 //Our includes
 #include "SimG4Core/CustomPhysics/interface/ToyModelHadronicProcess.hh"
@@ -344,14 +343,6 @@ G4VParticleChange* ToyModelHadronicProcess::PostStepDoIt(const G4Track& track,
 	}
     } 
 
-
-
-
-
-
-
-
-
   //clear interaction length      
   ClearNumberOfInteractionLengthLeft();
   //return the result
diff --git a/SimG4Core/GFlash/interface/G4MiscLHEPBuilder_WP.h b/SimG4Core/GFlash/interface/G4MiscLHEPBuilder_WP.h
index 381755372fe11..f709622b591d2 100644
--- a/SimG4Core/GFlash/interface/G4MiscLHEPBuilder_WP.h
+++ b/SimG4Core/GFlash/interface/G4MiscLHEPBuilder_WP.h
@@ -56,7 +56,7 @@
 #include "G4AntiXiMinusInelasticProcess.hh"
 #include "G4OmegaMinusInelasticProcess.hh"
 #include "G4AntiOmegaMinusInelasticProcess.hh"
-
+/*
 #include "G4LEAntiProtonInelastic.hh"
 #include "G4LEAntiNeutronInelastic.hh"
 #include "G4LELambdaInelastic.hh"
@@ -88,7 +88,7 @@
 #include "G4HEAntiXiMinusInelastic.hh"
 #include "G4HEOmegaMinusInelastic.hh"
 #include "G4HEAntiOmegaMinusInelastic.hh"
-
+*/
 class GflashHadronWrapperProcess;
 
 class G4MiscLHEPBuilder_WP 
@@ -104,76 +104,76 @@ class G4MiscLHEPBuilder_WP
  
     // anti-proton
     G4AntiProtonInelasticProcess theAntiProtonInelastic;
-    G4LEAntiProtonInelastic* theLEAntiProtonModel;
-    G4HEAntiProtonInelastic* theHEAntiProtonModel;
+    //    G4LEAntiProtonInelastic* theLEAntiProtonModel;
+    //  G4HEAntiProtonInelastic* theHEAntiProtonModel;
 
     // anti-proton wrapper process for Gflash 
     GflashHadronWrapperProcess*  theWrappedAntiProtonInelastic;
 
     // anti-neutron
     G4AntiNeutronInelasticProcess  theAntiNeutronInelastic;
-    G4LEAntiNeutronInelastic* theLEAntiNeutronModel;
-    G4HEAntiNeutronInelastic* theHEAntiNeutronModel;
+    // G4LEAntiNeutronInelastic* theLEAntiNeutronModel;
+    // G4HEAntiNeutronInelastic* theHEAntiNeutronModel;
 
     // Lambda
     G4LambdaInelasticProcess  theLambdaInelastic;
-    G4LELambdaInelastic*  theLELambdaModel;
-    G4HELambdaInelastic*  theHELambdaModel;
+    // G4LELambdaInelastic*  theLELambdaModel;
+    // G4HELambdaInelastic*  theHELambdaModel;
 
     // AntiLambda
     G4AntiLambdaInelasticProcess  theAntiLambdaInelastic;
-    G4LEAntiLambdaInelastic*  theLEAntiLambdaModel;
-    G4HEAntiLambdaInelastic*  theHEAntiLambdaModel;
+    // G4LEAntiLambdaInelastic*  theLEAntiLambdaModel;
+    // G4HEAntiLambdaInelastic*  theHEAntiLambdaModel;
 
     // SigmaMinus
     G4SigmaMinusInelasticProcess  theSigmaMinusInelastic;
-    G4LESigmaMinusInelastic*  theLESigmaMinusModel;
-    G4HESigmaMinusInelastic*  theHESigmaMinusModel;
+    // G4LESigmaMinusInelastic*  theLESigmaMinusModel;
+    // G4HESigmaMinusInelastic*  theHESigmaMinusModel;
 
     // AntiSigmaMinus
     G4AntiSigmaMinusInelasticProcess  theAntiSigmaMinusInelastic;
-    G4LEAntiSigmaMinusInelastic*  theLEAntiSigmaMinusModel;
-    G4HEAntiSigmaMinusInelastic*  theHEAntiSigmaMinusModel;
+    // G4LEAntiSigmaMinusInelastic*  theLEAntiSigmaMinusModel;
+    // G4HEAntiSigmaMinusInelastic*  theHEAntiSigmaMinusModel;
 
     // SigmaPlus
     G4SigmaPlusInelasticProcess  theSigmaPlusInelastic;
-    G4LESigmaPlusInelastic*  theLESigmaPlusModel;
-    G4HESigmaPlusInelastic*  theHESigmaPlusModel;
+    // G4LESigmaPlusInelastic*  theLESigmaPlusModel;
+    // G4HESigmaPlusInelastic*  theHESigmaPlusModel;
 
     // AntiSigmaPlus
     G4AntiSigmaPlusInelasticProcess  theAntiSigmaPlusInelastic;
-    G4LEAntiSigmaPlusInelastic*  theLEAntiSigmaPlusModel;
-    G4HEAntiSigmaPlusInelastic*  theHEAntiSigmaPlusModel;
+    // G4LEAntiSigmaPlusInelastic*  theLEAntiSigmaPlusModel;
+    // G4HEAntiSigmaPlusInelastic*  theHEAntiSigmaPlusModel;
 
     // XiZero
     G4XiZeroInelasticProcess  theXiZeroInelastic;
-    G4LEXiZeroInelastic*  theLEXiZeroModel;
-    G4HEXiZeroInelastic*  theHEXiZeroModel;
+    // G4LEXiZeroInelastic*  theLEXiZeroModel;
+    // G4HEXiZeroInelastic*  theHEXiZeroModel;
 
     // AntiXiZero
     G4AntiXiZeroInelasticProcess  theAntiXiZeroInelastic;
-    G4LEAntiXiZeroInelastic*  theLEAntiXiZeroModel;
-    G4HEAntiXiZeroInelastic*  theHEAntiXiZeroModel;
+    // G4LEAntiXiZeroInelastic*  theLEAntiXiZeroModel;
+    // G4HEAntiXiZeroInelastic*  theHEAntiXiZeroModel;
 
     // XiMinus
     G4XiMinusInelasticProcess  theXiMinusInelastic;
-    G4LEXiMinusInelastic*  theLEXiMinusModel;
-    G4HEXiMinusInelastic*  theHEXiMinusModel;
+    // G4LEXiMinusInelastic*  theLEXiMinusModel;
+    // G4HEXiMinusInelastic*  theHEXiMinusModel;
 
     // AntiXiMinus
     G4AntiXiMinusInelasticProcess  theAntiXiMinusInelastic;
-    G4LEAntiXiMinusInelastic*  theLEAntiXiMinusModel;
-    G4HEAntiXiMinusInelastic*  theHEAntiXiMinusModel;
+    // G4LEAntiXiMinusInelastic*  theLEAntiXiMinusModel;
+    // G4HEAntiXiMinusInelastic*  theHEAntiXiMinusModel;
 
     // OmegaMinus
     G4OmegaMinusInelasticProcess  theOmegaMinusInelastic;
-    G4LEOmegaMinusInelastic*  theLEOmegaMinusModel;
-    G4HEOmegaMinusInelastic*  theHEOmegaMinusModel;
+    // G4LEOmegaMinusInelastic*  theLEOmegaMinusModel;
+    // G4HEOmegaMinusInelastic*  theHEOmegaMinusModel;
 
     // AntiOmegaMinus
     G4AntiOmegaMinusInelasticProcess  theAntiOmegaMinusInelastic;
-    G4LEAntiOmegaMinusInelastic*  theLEAntiOmegaMinusModel;
-    G4HEAntiOmegaMinusInelastic*  theHEAntiOmegaMinusModel;
+    // G4LEAntiOmegaMinusInelastic*  theLEAntiOmegaMinusModel;
+    // G4HEAntiOmegaMinusInelastic*  theHEAntiOmegaMinusModel;
 
     G4bool wasActivated;
 };
diff --git a/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc b/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc
index 09fac2c0d02e6..30c4b5ca93b0b 100644
--- a/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc
+++ b/SimG4Core/GFlash/src/G4MiscLHEPBuilder_WP.cc
@@ -59,9 +59,9 @@ G4MiscLHEPBuilder_WP::~G4MiscLHEPBuilder_WP()
 
 void G4MiscLHEPBuilder_WP::Build()
 {
-  G4ProcessManager * aProcMan = 0;
+  //G4ProcessManager * aProcMan = 0;
   wasActivated = true;
-  
+  /*  
   // anti-Proton
   aProcMan = G4AntiProton::AntiProton()->GetProcessManager();
   theLEAntiProtonModel = new G4LEAntiProtonInelastic();
@@ -190,6 +190,7 @@ void G4MiscLHEPBuilder_WP::Build()
   theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel);
   theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel);
   aProcMan->AddDiscreteProcess(&theAntiOmegaMinusInelastic);
+  */
 }
 
 // 2002 by J.P. Wellisch
diff --git a/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc b/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc
index d922c10b9145c..f2f094e650b12 100644
--- a/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc
+++ b/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc
@@ -6,6 +6,8 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "G4Track.hh"
+#include "G4PhysicalConstants.hh"
+#include "G4SystemOfUnits.hh"
 
 SaveSimTrack::SaveSimTrack(edm::ParameterSet const & p) {