diff --git a/hw/application_fpga/core/tk1/rtl/tk1.v b/hw/application_fpga/core/tk1/rtl/tk1.v
index 039f610..2dc6dfb 100644
--- a/hw/application_fpga/core/tk1/rtl/tk1.v
+++ b/hw/application_fpga/core/tk1/rtl/tk1.v
@@ -63,8 +63,6 @@ module tk1 #(
   localparam ADDR_NAME1 = 8'h01;
   localparam ADDR_VERSION = 8'h02;
 
-  localparam ADDR_APP_MODE_CTRL = 8'h08;
-
   localparam ADDR_LED = 8'h09;
   localparam LED_R_BIT = 2;
   localparam LED_G_BIT = 1;
@@ -618,10 +616,6 @@ module tk1 #(
           tmp_read_data = TK1_VERSION;
         end
 
-        if (address == ADDR_APP_MODE_CTRL) begin
-          tmp_read_data = {32{app_mode}};
-        end
-
         if (address == ADDR_LED) begin
           tmp_read_data = {29'h0, led_reg};
         end
diff --git a/hw/application_fpga/core/tk1/tb/tb_tk1.v b/hw/application_fpga/core/tk1/tb/tb_tk1.v
index 475d811..1422701 100644
--- a/hw/application_fpga/core/tk1/tb/tb_tk1.v
+++ b/hw/application_fpga/core/tk1/tb/tb_tk1.v
@@ -27,8 +27,6 @@ module tb_tk1 ();
   localparam ADDR_NAME1 = 8'h01;
   localparam ADDR_VERSION = 8'h02;
 
-  localparam ADDR_APP_MODE_CTRL = 8'h08;
-
   localparam ADDR_LED = 8'h09;
   localparam LED_R_BIT = 2;
   localparam LED_G_BIT = 1;
diff --git a/hw/application_fpga/fw/testfw/main.c b/hw/application_fpga/fw/testfw/main.c
index 7eb89d3..4613e14 100644
--- a/hw/application_fpga/fw/testfw/main.c
+++ b/hw/application_fpga/fw/testfw/main.c
@@ -16,7 +16,6 @@ volatile uint32_t *tk1name1         = (volatile uint32_t *)TK1_MMIO_TK1_NAME1;
 volatile uint32_t *uds              = (volatile uint32_t *)TK1_MMIO_UDS_FIRST;
 volatile uint32_t *cdi              = (volatile uint32_t *)TK1_MMIO_TK1_CDI_FIRST;
 volatile uint32_t *udi              = (volatile uint32_t *)TK1_MMIO_TK1_UDI_FIRST;
-volatile uint32_t *app_mode_ctrl    = (volatile uint32_t *)TK1_MMIO_TK1_APP_MODE_CTRL;
 volatile uint8_t  *fw_ram           = (volatile uint8_t  *)TK1_MMIO_FW_RAM_BASE;
 volatile uint32_t *timer            = (volatile uint32_t *)TK1_MMIO_TIMER_TIMER;
 volatile uint32_t *timer_prescaler  = (volatile uint32_t *)TK1_MMIO_TIMER_PRESCALER;
@@ -297,12 +296,6 @@ int main(void)
 		}
 	}
 
-	uint32_t sw = *app_mode_ctrl;
-	if (sw != 0) {
-		failmsg("app_mode_ctrl is not 0 in fw mode");
-		anyfailed = 1;
-	}
-
 	puts("\r\nTesting timer... 3");
 	// Matching clock at 24 MHz, giving us timer in seconds
 	*timer_prescaler = 24 * 1000000;
diff --git a/hw/application_fpga/fw/tk1/main.c b/hw/application_fpga/fw/tk1/main.c
index 69a2376..95c4995 100644
--- a/hw/application_fpga/fw/tk1/main.c
+++ b/hw/application_fpga/fw/tk1/main.c
@@ -14,7 +14,6 @@
 
 // clang-format off
 static volatile uint32_t *uds              = (volatile uint32_t *)TK1_MMIO_UDS_FIRST;
-static volatile uint32_t *app_mode_ctrl    = (volatile uint32_t *)TK1_MMIO_TK1_APP_MODE_CTRL;
 static volatile uint32_t *name0            = (volatile uint32_t *)TK1_MMIO_TK1_NAME0;
 static volatile uint32_t *name1            = (volatile uint32_t *)TK1_MMIO_TK1_NAME1;
 static volatile uint32_t *ver              = (volatile uint32_t *)TK1_MMIO_TK1_VERSION;
diff --git a/hw/application_fpga/fw/tk1_mem.h b/hw/application_fpga/fw/tk1_mem.h
index 6dbbf76..95936be 100644
--- a/hw/application_fpga/fw/tk1_mem.h
+++ b/hw/application_fpga/fw/tk1_mem.h
@@ -108,10 +108,6 @@
 #define TK1_MMIO_TK1_NAME1 0xff000004
 #define TK1_MMIO_TK1_VERSION 0xff000008
 
-// Deprecated - use _APP_MODE_CTRL instead
-#define TK1_MMIO_TK1_SWITCH_APP 0xff000020
-#define TK1_MMIO_TK1_APP_MODE_CTRL 0xff000020
-
 #define TK1_MMIO_TK1_LED 0xff000024
 #define TK1_MMIO_TK1_LED_R_BIT 2
 #define TK1_MMIO_TK1_LED_G_BIT 1