diff --git a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp
index d1e8d33c103e250ff97693cd8566d53ad75a21ac..3318bba8e87c8d4580acf7f7cad4b9994c6c01d4 100644
--- a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp
+++ b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp
@@ -57,13 +57,6 @@ void FlightStatsRecorder::dropDetected(uint64_t ts)
     stats.dropTs = ts;
 }
 
-void FlightStatsRecorder::deploymentDetected(uint64_t ts, Meter alt)
-{
-    Lock<FastMutex> lock{statsMutex};
-    stats.dplTs  = ts;
-    stats.dplAlt = alt;
-}
-
 void FlightStatsRecorder::updateAcc(const AccelerometerData& data)
 {
     auto fmmState = getModule<FlightModeManager>()->getState();
@@ -75,23 +68,10 @@ void FlightStatsRecorder::updateAcc(const AccelerometerData& data)
     auto acc = MeterPerSecondSquared{static_cast<Vector3f>(data).norm()};
     Lock<FastMutex> lock{statsMutex};
 
-    if (fmmState != FlightModeManagerState::FLYING_DROGUE_DESCENT)
-    {
-        // Record this event only after drop, before deployment
-        if (acc > stats.dropMaxAcc)
-        {
-            stats.dropMaxAcc   = acc;
-            stats.dropMaxAccTs = data.accelerationTimestamp;
-        }
-    }
-    else
+    if (acc > stats.dropMaxAcc)
     {
-        // Record this event only after deployment
-        if (acc > stats.dplMaxAcc)
-        {
-            stats.dplMaxAcc   = acc;
-            stats.dplMaxAccTs = data.accelerationTimestamp;
-        }
+        stats.dropMaxAcc   = acc;
+        stats.dropMaxAccTs = data.accelerationTimestamp;
     }
 }
 
diff --git a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h
index b6276ba14c31561b3bd3317cc11eb3ab9e621e1d..a0d0a306243d492651473c447932b297cd13d75a 100644
--- a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h
+++ b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h
@@ -45,7 +45,7 @@ public:
         // Drop
         uint64_t dropTs = 0;
 
-        // Maximum acceleration after drop, before deployment
+        // Maximum acceleration after drop
         uint64_t dropMaxAccTs = 0;
         Boardcore::Units::Acceleration::MeterPerSecondSquared dropMaxAcc{0};
 
@@ -53,14 +53,6 @@ public:
         uint64_t maxSpeedTs = 0;
         Boardcore::Units::Speed::MeterPerSecond maxSpeed{0};
         Boardcore::Units::Length::Meter maxSpeedAlt{0};
-
-        // Deployment
-        uint64_t dplTs = 0;
-        Boardcore::Units::Length::Meter dplAlt{0};
-
-        // Maximum acceleration after deployment
-        uint64_t dplMaxAccTs = 0;
-        Boardcore::Units::Acceleration::MeterPerSecondSquared dplMaxAcc{0};
     };
 
     void reset();
@@ -68,7 +60,6 @@ public:
     Stats getStats();
 
     void dropDetected(uint64_t ts);
-    void deploymentDetected(uint64_t ts, Boardcore::Units::Length::Meter alt);
 
     void updateAcc(const Boardcore::AccelerometerData& data);
     void updateNas(const Boardcore::NASState& data, float refTemperature);
diff --git a/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h b/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h
index 7024795542b2de8068820ee7af628f8b59f78b5d..9cc8608ba711e3018a2b47541d53635e836af1e7 100644
--- a/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h
+++ b/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h
@@ -42,7 +42,7 @@ public:
     /**
      * @brief Constructor
      */
-    AltitudeTrigger(AltitudeTriggerConfig config);
+    explicit AltitudeTrigger(AltitudeTriggerConfig config);
 
     /**
      * @brief Adds the update() task to the task scheduler.