diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp
index 60bf26a0..36835051 100644
--- a/mission/devices/PayloadPcduHandler.cpp
+++ b/mission/devices/PayloadPcduHandler.cpp
@@ -74,6 +74,9 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_
       return HasReturnvaluesIF::RETURN_FAILED;
     }
     if (state == States::POWER_CHANNELS_ON) {
+#if OBSW_VERBOSE_LEVEL >= 1
+    sif::info << "Switching on SSR VBAT0 & VBAT1 GPIOs" << std::endl;
+#endif
       // Switch on relays here
       gpioIF->pullHigh(gpioIds::PLPCDU_ENB_VBAT0);
       gpioIF->pullHigh(gpioIds::PLPCDU_ENB_VBAT1);
@@ -106,10 +109,8 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_
           adcCountdown.setTimeout(100);
           adcCountdown.resetTimer();
           adcCmdExecuted = false;
-          if (submode == plpcdu::NORMAL_ADC_ONLY) {
-            setMode(MODE_NORMAL, submode);
-            return HasReturnvaluesIF::RETURN_OK;
-          }
+          setMode(MODE_NORMAL, submode);
+          return HasReturnvaluesIF::RETURN_OK;
         }
       }
     }
@@ -128,7 +129,7 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_
 
   if (submode == NormalSubmodes::X8_ON) {
 #if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU X8 module" << std::endl;
+    sif::info << "Enabling PL PCDU X8 module" << std::endl;
 #endif
     // Switch on DRO and start monitoring for negative voltages
     gpioIF->pullHigh(gpioIds::PLPCDU_ENB_DRO);
@@ -139,7 +140,7 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_
 
   if (submode == NormalSubmodes::TX_ON) {
 #if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU TX module" << std::endl;
+    sif::info << "Enabling PL PCDU TX module" << std::endl;
 #endif
     // Switch on DRO and start monitoring for negative voltages
     gpioIF->pullHigh(gpioIds::PLPCDU_ENB_TX);
@@ -150,7 +151,7 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_
 
   if (submode == NormalSubmodes::MPA_ON) {
 #if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU MPA module" << std::endl;
+    sif::info << "Enabling PL PCDU MPA module" << std::endl;
 #endif
     // Switch on DRO and start monitoring for negative voltages
     gpioIF->pullHigh(gpioIds::PLPCDU_ENB_MPA);
@@ -161,7 +162,7 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_
 
   if (submode == NormalSubmodes::HPA_ON) {
 #if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU HPA module" << std::endl;
+    sif::info << "Enabling PL PCDU HPA module" << std::endl;
 #endif
     // Switch on DRO and start monitoring for negative voltages
     gpioIF->pullHigh(gpioIds::PLPCDU_ENB_HPA);
diff --git a/mission/devices/devicedefinitions/payloadPcduDefinitions.h b/mission/devices/devicedefinitions/payloadPcduDefinitions.h
index 34a3847a..3013cb82 100644
--- a/mission/devices/devicedefinitions/payloadPcduDefinitions.h
+++ b/mission/devices/devicedefinitions/payloadPcduDefinitions.h
@@ -91,9 +91,6 @@ static constexpr DeviceCommandId_t SETUP_CMD = 1;
 static constexpr DeviceCommandId_t READ_TEMP_EXT = 2;
 static constexpr DeviceCommandId_t READ_WITH_TEMP_EXT = 3;
 
-static constexpr Submode_t NORMAL_ADC_ONLY = 0;
-static constexpr Submode_t NORMAL_ALL_ON = 1;
-
 enum NormalSubmodes {
   ALL_OFF = 0,
   SOLID_STATE_RELAYS_ADC_ON = 1,
diff --git a/mission/system/PlPcduAssembly.cpp b/mission/system/PlPcduAssembly.cpp
deleted file mode 100644
index 88403be2..00000000
--- a/mission/system/PlPcduAssembly.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "PlPcduAssembly.h"
diff --git a/mission/system/PlPcduAssembly.h b/mission/system/PlPcduAssembly.h
deleted file mode 100644
index d74a6693..00000000
--- a/mission/system/PlPcduAssembly.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef MISSION_SYSTEM_PLPCDUASSEMBLY_H_
-#define MISSION_SYSTEM_PLPCDUASSEMBLY_H_
-
-#endif /* MISSION_SYSTEM_PLPCDUASSEMBLY_H_ */