diff --git a/include/app_task.h b/include/app_task.h
index 53e4eb8..564c878 100644
--- a/include/app_task.h
+++ b/include/app_task.h
@@ -30,5 +30,4 @@ private:
     bool last_switch_state[NUM_PADS];
     
     void process_switch_event(uint8_t switch_id, bool pressed);
-    void run_layout_test();
 };
diff --git a/src/app_task.cpp b/src/app_task.cpp
index e5f1607..89f12dd 100644
--- a/src/app_task.cpp
+++ b/src/app_task.cpp
@@ -1,7 +1,5 @@
 #include "app_task.h"
 #include <Arduino.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
 
 AppTask::AppTask(LedStub* led, SwitchStub* sw, UsbMidiTransport* midi)
     : led_driver(led), switch_driver(sw), midi_transport(midi) {
@@ -25,33 +23,9 @@ void AppTask::begin() {
         process_midi_event(event);
     });
     
-    // Auto-run layout test on boot (no serial needed)
-    run_layout_test();
-    
     Serial.println("[APP] Controller ready");
 }
 
-void AppTask::run_layout_test() {
-    Serial.println("[APP] Running layout test (Launchpad X: notes 36-45, ch1)...");
-    
-    // Quick test: Launchpad X (notes 36-45, ch1) - 500ms per pad
-    for (uint8_t i = 0; i < NUM_PADS; i++) {
-        MidiEvent event;
-        event.type = MidiEvent::NOTE_ON;
-        event.channel = 1;
-        event.data1 = 36 + i;
-        event.data2 = 64;
-        process_midi_event(event);
-        vTaskDelay(pdMS_TO_TICKS(500));
-        event.type = MidiEvent::NOTE_OFF;
-        event.data2 = 0;
-        process_midi_event(event);
-        vTaskDelay(pdMS_TO_TICKS(100));
-    }
-    
-    Serial.println("[APP] Layout test complete");
-}
-
 void AppTask::update() {
     for (uint8_t i = 0; i < NUM_PADS; i++) {
         bool is_pressed = switch_driver->is_pressed(i);