diff --git a/firmware/controllers/actuators/aux_pid.cpp b/firmware/controllers/actuators/aux_pid.cpp
index c68c4cb6bd..ec065d8c26 100644
--- a/firmware/controllers/actuators/aux_pid.cpp
+++ b/firmware/controllers/actuators/aux_pid.cpp
@@ -134,7 +134,7 @@ void startAuxPins(void) {
 void stopAuxPins(void) {
 #if EFI_PROD_CODE
 	for (int i = 0;i < AUX_PID_COUNT;i++) {
-		brain_pin_markUnused(activeConfiguration.auxPidPins[i]);
+		efiSetPadUnused(activeConfiguration.auxPidPins[i]);
 	}
 #endif /* EFI_PROD_CODE */
 }
diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp
index eea5454126..95ac8b1e69 100644
--- a/firmware/controllers/actuators/boost_control.cpp
+++ b/firmware/controllers/actuators/boost_control.cpp
@@ -212,7 +212,7 @@ void startBoostPin() {
 
 void stopBoostPin() {
 #if !EFI_UNIT_TEST
-	brain_pin_markUnused(activeConfiguration.boostControlPin);
+	efiSetPadUnused(activeConfiguration.boostControlPin);
 #endif /* EFI_UNIT_TEST */
 }
 
diff --git a/firmware/controllers/actuators/idle_hardware.cpp b/firmware/controllers/actuators/idle_hardware.cpp
index 350e31310a..ef4fb2fb5c 100644
--- a/firmware/controllers/actuators/idle_hardware.cpp
+++ b/firmware/controllers/actuators/idle_hardware.cpp
@@ -124,14 +124,10 @@ bool isIdleMotorBusy(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 
 void stopIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 #if EFI_PROD_CODE
-	brain_pin_markUnused(activeConfiguration.stepperEnablePin);
-	brain_pin_markUnused(activeConfiguration.idle.stepperStepPin);
-	brain_pin_markUnused(activeConfiguration.idle.solenoidPin);
-	brain_pin_markUnused(activeConfiguration.secondSolenoidPin);
-//	brain_pin_markUnused(activeConfiguration.idle.);
-//	brain_pin_markUnused(activeConfiguration.idle.);
-//	brain_pin_markUnused(activeConfiguration.idle.);
-//	brain_pin_markUnused(activeConfiguration.idle.);
+	efiSetPadUnused(activeConfiguration.stepperEnablePin);
+	efiSetPadUnused(activeConfiguration.idle.stepperStepPin);
+	efiSetPadUnused(activeConfiguration.idle.solenoidPin);
+	efiSetPadUnused(activeConfiguration.secondSolenoidPin);
 #endif /* EFI_PROD_CODE */
 }
 
diff --git a/firmware/hw_layer/debounce.cpp b/firmware/hw_layer/debounce.cpp
index 9444f801c2..af9307aa3e 100644
--- a/firmware/hw_layer/debounce.cpp
+++ b/firmware/hw_layer/debounce.cpp
@@ -60,7 +60,7 @@ void ButtonDebounce::stopConfiguration () {
     if (*m_pin != active_pin || *m_mode != active_mode || (isActiveConfigurationVoid && (*m_pin != 0 || *m_mode != 0))) {
 #endif /* EFI_ACTIVE_CONFIGURATION_IN_FLASH */
 #ifndef EFI_UNIT_TEST
-        brain_pin_markUnused(active_pin);
+    	efiSetPadUnused(active_pin);
         needsInit = true;
 #endif /* EFI_UNIT_TEST */
     }
diff --git a/firmware/hw_layer/digital_input/digital_input_icu.cpp b/firmware/hw_layer/digital_input/digital_input_icu.cpp
index 37e4536b69..542c390503 100644
--- a/firmware/hw_layer/digital_input/digital_input_icu.cpp
+++ b/firmware/hw_layer/digital_input/digital_input_icu.cpp
@@ -217,7 +217,7 @@ void stopDigitalCapture(const char *msg, brain_pin_e brainPin) {
 	if (brainPin == GPIO_UNASSIGNED) {
 		return;
 	}
-	brain_pin_markUnused(brainPin);
+	efiSetPadUnused(brainPin);
 
 	ICUDriver *driver = getInputCaptureDriver(msg, brainPin);
 	if (driver == NULL) {
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 7695dd826d..bc634fd2c0 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -291,9 +291,9 @@ void stopSpi(spi_device_e device) {
 		return; // not turned on
 	}
 	isSpiInitialized[device] = false;
-	brain_pin_markUnused(getSckPin(device));
-	brain_pin_markUnused(getMisoPin(device));
-	brain_pin_markUnused(getMosiPin(device));
+	efiSetPadUnused(getSckPin(device));
+	efiSetPadUnused(getMisoPin(device));
+	efiSetPadUnused(getMosiPin(device));
 #endif /* HAL_USE_SPI */
 }