diff --git a/linux/payload/FreshSupvHandler.h b/linux/payload/FreshSupvHandler.h
index 8821fa1f..2c700deb 100644
--- a/linux/payload/FreshSupvHandler.h
+++ b/linux/payload/FreshSupvHandler.h
@@ -14,9 +14,6 @@
 
 using supv::TcBase;
 
-static constexpr bool DEBUG_PLOC_SUPV = false;
-static constexpr bool REDUCE_NORMAL_MODE_PRINTOUT = true;
-
 class FreshSupvHandler : public FreshDeviceHandlerBase {
  public:
   enum OpCode { DEFAULT_OPERATION = 0, PARSE_TM = 1 };
diff --git a/linux/payload/plocSupvDefs.h b/linux/payload/plocSupvDefs.h
index 06dd7b8e..a770fb49 100644
--- a/linux/payload/plocSupvDefs.h
+++ b/linux/payload/plocSupvDefs.h
@@ -11,14 +11,13 @@
 #include <mission/payload/plocSpBase.h>
 
 #include <atomic>
-#include <optional>
 
 #include "eive/eventSubsystemIds.h"
 #include "eive/resultClassIds.h"
 
 namespace supv {
 
-static constexpr bool DEBUG_PLOC_SUPV = true;
+static constexpr bool DEBUG_PLOC_SUPV = false;
 static constexpr bool REDUCE_NORMAL_MODE_PRINTOUT = true;
 
 static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPERVISOR_HANDLER;