diff --git a/firmware/controllers/algo/algo.mk b/firmware/controllers/algo/algo.mk
index 6e89e0eb6e..8161c85140 100644
--- a/firmware/controllers/algo/algo.mk
+++ b/firmware/controllers/algo/algo.mk
@@ -3,7 +3,6 @@ CONTROLLERS_ALGO_SRC = $(PROJECT_DIR)/controllers/algo/map_adjuster.c \
 	$(PROJECT_DIR)/controllers/algo/nmea.c
 	
 CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
-	$(PROJECT_DIR)/controllers/algo/idle_controller.cpp \
 	$(PROJECT_DIR)/controllers/algo/malfunction_central.cpp \
 	$(PROJECT_DIR)/controllers/algo/auto_generated_enums.cpp \
 	$(PROJECT_DIR)/controllers/algo/fuel_math.cpp \
diff --git a/firmware/controllers/electronic_throttle.cpp b/firmware/controllers/electronic_throttle.cpp
index 2a08ad034a..144cb08ef4 100644
--- a/firmware/controllers/electronic_throttle.cpp
+++ b/firmware/controllers/electronic_throttle.cpp
@@ -30,7 +30,6 @@
 
 #include "main.h"
 #include "electronic_throttle.h"
-#include "idle_controller.h"
 #include "tps.h"
 #include "io_pins.h"
 #include "engine_configuration.h"
diff --git a/firmware/controllers/idle_thread.cpp b/firmware/controllers/idle_thread.cpp
index 452c4603ff..82df687e7e 100644
--- a/firmware/controllers/idle_thread.cpp
+++ b/firmware/controllers/idle_thread.cpp
@@ -25,7 +25,6 @@
  */
 
 #include "main.h"
-#include "idle_controller.h"
 #include "rpm_calculator.h"
 #include "pwm_generator.h"
 #include "idle_thread.h"
@@ -53,12 +52,6 @@ static StepperMotor iacMotor;
  */
 static percent_t actualIdlePosition = -100.0f;
 
-/**
- * Idle level calculation algorithm lives in idle_controller.cpp
- * todo: replace this with a PID regulator?
- */
-static IdleValveState idlePositionController;
-
 void idleDebug(const char *msg, percent_t value) {
 	scheduleMsg(logger, "idle debug: %s%f", msg, value);
 }
@@ -184,7 +177,7 @@ percent_t getIdlePosition(void) {
 static void autoIdle() {
 	efitimems_t now = currentTimeMillis();
 
-	percent_t newValue = idlePositionController.getIdle(getRpmE(engine), now PASS_ENGINE_PARAMETER_SUFFIX);
+	percent_t newValue = 0;//idlePositionController.getIdle(getRpmE(engine), now PASS_ENGINE_PARAMETER_SUFFIX);
 
 	if (currentIdleValve != newValue) {
 		currentIdleValve = newValue;
@@ -237,7 +230,7 @@ static msg_t ivThread(int param) {
 }
 
 void setTargetIdleRpm(int value) {
-	idlePositionController.setTargetRpm(value);
+	engineConfiguration->targetIdleRpm = value;
 	scheduleMsg(logger, "target idle RPM %d", value);
 }
 
@@ -315,8 +308,7 @@ void startIdleThread(Logging*sharedLogger) {
 	// todo: re-initialize idle pins on the fly
 	initIdleHardware();
 
-	idlePositionController.init();
-	scheduleMsg(logger, "initial idle %d", idlePositionController.value);
+	//scheduleMsg(logger, "initial idle %d", idlePositionController.value);
 
 	chThdCreateStatic(ivThreadStack, sizeof(ivThreadStack), NORMALPRIO, (tfunc_t) ivThread, NULL);
 
diff --git a/unit_tests/map_resize.cpp b/unit_tests/map_resize.cpp
index 899b51cac8..8ce45092b4 100644
--- a/unit_tests/map_resize.cpp
+++ b/unit_tests/map_resize.cpp
@@ -10,7 +10,6 @@
 #include "interpolation.h"
 #include "engine_configuration.h"
 #include "main.h"
-#include "idle_controller.h"
 
 #if 1
 
diff --git a/unit_tests/test_idle_controller.cpp b/unit_tests/test_idle_controller.cpp
index 6d84f91b07..914e4ef461 100644
--- a/unit_tests/test_idle_controller.cpp
+++ b/unit_tests/test_idle_controller.cpp
@@ -6,14 +6,11 @@
  */
 
 #include <stdio.h>
-#include "idle_controller.h"
+
 #include "efitime.h"
 #include "engine_test_helper.h"
 #include "pid.h"
 
-void idleDebug(const char *msg, percent_t value) {
-	printf("%s\r\n", msg);
-}
 
 void testPidController(void) {
 	print("******************************************* testPidController\r\n");