diff --git a/power/Fuse.h b/power/Fuse.h
index cc1d534f4..b892611bc 100644
--- a/power/Fuse.h
+++ b/power/Fuse.h
@@ -85,10 +85,7 @@ private:
 	};
 	PowerMonitor powerMonitor;
 	StaticLocalDataSet<3> set;
-	//LocalPoolDataSetBase* set = nullptr;
-	//PIDReader<float> voltage;
-	//PIDReader<float> current;
-	//PIDReader<uint8_t> state;
+
 	lp_var_t<float> voltage;
 	lp_var_t<float> current;
 	lp_var_t<uint8_t> state;
diff --git a/thermal/ThermalModule.cpp b/thermal/ThermalModule.cpp
index 2bc1741f6..457a6743d 100644
--- a/thermal/ThermalModule.cpp
+++ b/thermal/ThermalModule.cpp
@@ -256,15 +256,16 @@ bool ThermalModule::calculateModuleHeaterRequestAndSetModuleStatus(
 }
 
 void ThermalModule::setHeating(bool on) {
-//	GlobDataSet mySet;
-//	gp_int8_t writableTargetState(targetState.getDataPoolId(),
-//			&mySet, PoolVariableIF::VAR_WRITE);
-//	if (on) {
-//		writableTargetState = STATE_REQUEST_HEATING;
-//	} else {
-//		writableTargetState = STATE_REQUEST_PASSIVE;
-//	}
-//	mySet.commit(PoolVariableIF::VALID);
+	ReturnValue_t result = targetState.read();
+	if(result == HasReturnvaluesIF::RETURN_OK) {
+		if(on) {
+			targetState.value = STATE_REQUEST_HEATING;
+		}
+		else {
+			targetState.value = STATE_REQUEST_PASSIVE;
+		}
+	}
+	targetState.setValid(true);
 }
 
 void ThermalModule::updateTargetTemperatures(ThermalComponentIF* component,
diff --git a/thermal/ThermalModule.h b/thermal/ThermalModule.h
index d1e4fccbf..0abe51c7e 100644
--- a/thermal/ThermalModule.h
+++ b/thermal/ThermalModule.h
@@ -5,8 +5,6 @@
 #include "tcsDefinitions.h"
 #include "RedundantHeater.h"
 
-//#include "../datapoolglob/GlobalDataSet.h"
-//#include "../datapoolglob/GlobalPoolVariable.h"
 #include "../datapoollocal/LocalPoolDataSetBase.h"
 #include "../datapoollocal/LocalPoolVariable.h"
 #include "../devicehandlers/HealthDevice.h"
@@ -78,7 +76,6 @@ protected:
 	Parameters parameters;
 
 	lp_var_t<float> moduleTemperature;
-	//gp_float_t moduleTemperature;
 
 	RedundantHeater *heater = nullptr;