diff --git a/control/json/zone.cpp b/control/json/zone.cpp
index 08aa91a..bf11cba 100644
--- a/control/json/zone.cpp
+++ b/control/json/zone.cpp
@@ -227,19 +227,10 @@
     if (value != current && isSupported)
     {
         current = ThermalObject::current(value);
-        if (isPersisted("xyz.openbmc_project.Control.ThermalMode", "Current"))
+        if (isPersisted(thermModeIntf, currentProp))
         {
             saveCurrentMode();
         }
-        // TODO Trigger event(s) for current mode property change
-        // auto eData =
-        // _objects[_path]["xyz.openbmc_project.Control.ThermalMode"]
-        //                      ["Current"];
-        // if (eData != nullptr)
-        // {
-        //     sdbusplus::message::message nullMsg{nullptr};
-        //     handleEvent(nullMsg, eData);
-        // }
     }
 
     return current;