diff --git a/src/algorithms/tracking/TracksToParticles.cc b/src/algorithms/tracking/TracksToParticles.cc
index 12399d2737..f609735504 100644
--- a/src/algorithms/tracking/TracksToParticles.cc
+++ b/src/algorithms/tracking/TracksToParticles.cc
@@ -128,8 +128,6 @@ namespace eicrecon {
             auto rec_part = parts->create();
             rec_part.addToTracks(track);
             auto referencePoint = rec_part.getReferencePoint();
-            // float time          = 0;
-            float mass = 0;
             if (best_match >= 0) {
                 trace("Best match is found and is: {}", best_match);
                 mc_prt_is_consumed[best_match] = true;
@@ -138,16 +136,14 @@ namespace eicrecon {
                         static_cast<float>(best_mc_part.getVertex().x),
                         static_cast<float>(best_mc_part.getVertex().y),
                         static_cast<float>(best_mc_part.getVertex().z)}; // @TODO: not sure if vertex/reference point makes sense here
-                // time                 = mcpart.getTime();
-                mass = best_mc_part.getMass();
             }
 
             rec_part.setType(static_cast<int16_t>(best_match >= 0 ? 0 : -1)); // @TODO: determine type codes
-            rec_part.setEnergy((float) std::hypot(edm4hep::utils::magnitude(mom), mass));
+            rec_part.setEnergy(edm4hep::utils::magnitude(mom));
             rec_part.setMomentum(mom);
             rec_part.setReferencePoint(referencePoint);
             rec_part.setCharge(charge_rec);
-            rec_part.setMass(mass);
+            rec_part.setMass(0.);
             rec_part.setGoodnessOfPID(0); // assume no PID until proven otherwise
             // rec_part.covMatrix()  // @TODO: covariance matrix on 4-momentum