diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
index 972aa4fe..7b1929cd 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
@@ -573,8 +573,6 @@ void DeviceHandlerBase::setTransition(Mode_t modeTo, Submode_t submodeTo) {
 }
 
 void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) {
-  /* TODO: This will probably be done by the LocalDataPoolManager now */
-  // changeHK(mode, submode, false);
 
   /**
    * handle transition from OFF to NORMAL by continuing towards normal when ON is reached
@@ -1595,6 +1593,14 @@ void DeviceHandlerBase::setPowerSwitcher(PowerSwitchIF* switcher) {
   this->powerSwitcher = switcher;
 }
 
+Mode_t DeviceHandlerBase::getMode() {
+  return mode;
+}
+
+Submode_t DeviceHandlerBase::getSubmode() {
+  return submode;
+}
+
 void DeviceHandlerBase::disableCommandsAndReplies() {
   for (auto& command : deviceCommandMap) {
     if (command.second.isExecuting) {
diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.h b/src/fsfw/devicehandlers/DeviceHandlerBase.h
index 3f13c108..65b3ded0 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -755,7 +755,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
    *
    * set via setMode()
    */
-  Submode_t getSubmode;
+  Submode_t getSubmode();
 
   /** This is the counter value from performOperation(). */
   uint8_t pstStep = 0;