diff --git a/eive_tmtc/tmtc/payload/subsystem.py b/eive_tmtc/tmtc/payload/subsystem.py
index 695a762..14eaa75 100644
--- a/eive_tmtc/tmtc/payload/subsystem.py
+++ b/eive_tmtc/tmtc/payload/subsystem.py
@@ -26,17 +26,13 @@ class OpCode(str, enum.Enum):
     REPORT_ALL_MODES = "report_modes"
 
 
-class PayloadMode(enum.IntEnum):
-    OFF = 0
-
-
 class Info(str, enum.Enum):
     OFF = "Off Command"
     REPORT_ALL_MODES = "Report all modes"
 
 
 HANDLER_LIST: Dict[str, Tuple[int, str]] = {
-    OpCode.OFF: (PayloadMode.OFF, Info.OFF),
+    OpCode.OFF: (ModeId.OFF, Info.OFF),
 }