diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp
index 3fed970e..24d3f198 100644
--- a/linux/devices/ploc/PlocSupervisorHandler.cpp
+++ b/linux/devices/ploc/PlocSupervisorHandler.cpp
@@ -139,18 +139,6 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
       plocSupvHelperExecuting = true;
       return EXECUTION_FINISHED;
     }
-      //    case LOGGING_REQUEST_EVENT_BUFFERS: {
-      //      if (size > config::MAX_PATH_SIZE) {
-      //        return result::FILENAME_TOO_LONG;
-      //      }
-      //      result = supvHelper->startEventBufferRequest(
-      //          std::string(reinterpret_cast<const char*>(data), size));
-      //      if (result != returnvalue::OK) {
-      //        return result;
-      //      }
-      //      plocSupvHelperExecuting = true;
-      //      return EXECUTION_FINISHED;
-      //    }
     default:
       break;
   }
@@ -568,25 +556,25 @@ ReturnValue_t PlocSupervisorHandler::enableReplyInReplyMap(DeviceCommandMap::ite
     case SET_ADC_ENABLED_CHANNELS:
     case SET_ADC_WINDOW_AND_STRIDE:
     case SET_ADC_THRESHOLD:
-    case COPY_ADC_DATA_TO_MRAM:
+    //case COPY_ADC_DATA_TO_MRAM:
     case RUN_AUTO_EM_TESTS:
-    case WIPE_MRAM:
+    //case WIPE_MRAM:
     case SET_GPIO:
     case READ_GPIO:
-    case RESTART_SUPERVISOR:
-    case FACTORY_RESET_CLEAR_ALL:
-    case FACTORY_RESET_CLEAR_MIRROR:
-    case FACTORY_RESET_CLEAR_CIRCULAR:
+    //case RESTART_SUPERVISOR:
+    //case FACTORY_RESET_CLEAR_ALL:
+    //case FACTORY_RESET_CLEAR_MIRROR:
+    //case FACTORY_RESET_CLEAR_CIRCULAR:
     case DISABLE_PERIOIC_HK_TRANSMISSION:
-    case START_MPSOC_QUIET:
+    //case START_MPSOC_QUIET:
     case SET_SHUTDOWN_TIMEOUT:
     case FACTORY_FLASH:
     case ENABLE_AUTO_TM:
     case DISABLE_AUTO_TM:
-    case LOGGING_CLEAR_COUNTERS:
-    case LOGGING_SET_TOPIC:
+    //case LOGGING_CLEAR_COUNTERS:
+    //case LOGGING_SET_TOPIC:
     case RESET_PL:
-    case ENABLE_NVMS:
+    //case ENABLE_NVMS:
       enabledReplies = 2;
       break;
     default: