diff --git a/source/Core/BSP/Pinecilv2/I2C_Wrapper.cpp b/source/Core/BSP/Pinecilv2/I2C_Wrapper.cpp
index 93d11ae5..ce80e330 100644
--- a/source/Core/BSP/Pinecilv2/I2C_Wrapper.cpp
+++ b/source/Core/BSP/Pinecilv2/I2C_Wrapper.cpp
@@ -40,10 +40,7 @@ bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t read_address, uint8_t *p_b
   i2cCfg.data             = p_buffer;
   i2cCfg.subAddrSize      = 1; // one byte address
 
-  taskENTER_CRITICAL();
-  /* --------------- */
-  err = I2C_MasterReceiveBlocking(I2C0_ID, &i2cCfg);
-  taskEXIT_CRITICAL();
+  err      = I2C_MasterReceiveBlocking(I2C0_ID, &i2cCfg);
   bool res = err == SUCCESS;
   if (!res) {
     I2C_Unstick();
@@ -65,10 +62,7 @@ bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress, uint8_t *p_bu
   i2cCfg.data             = p_buffer;
   i2cCfg.subAddrSize      = 1; // one byte address
 
-  taskENTER_CRITICAL();
-  /* --------------- */
-  err = I2C_MasterSendBlocking(I2C0_ID, &i2cCfg);
-  taskEXIT_CRITICAL();
+  err      = I2C_MasterSendBlocking(I2C0_ID, &i2cCfg);
   bool res = err == SUCCESS;
   if (!res) {
     I2C_Unstick();
diff --git a/source/Core/Threads/UI/logic/utils/SolderingCommon.cpp b/source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
index 9425c90f..865c6a40 100644
--- a/source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
+++ b/source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
@@ -39,8 +39,6 @@ bool checkExitSoldering(void) {
   }
 #endif
 
-  // If we have tripped thermal runaway, turn off heater and show warning
-
   return false;
 }