diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 5e123bd59e4..4ac253f1254 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/zmkfirmware/zmk-dev-arm:3.5
+FROM docker.io/zmkfirmware/zmk-dev-arm:3.5-branch
 
 COPY .bashrc tmp
 RUN mv /tmp/.bashrc ~/.bashrc
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 116618f4076..eb4d3c7db8c 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -27,9 +27,6 @@ target_sources(app PRIVATE src/behavior.c)
 target_sources_ifdef(CONFIG_ZMK_KSCAN_SIDEBAND_BEHAVIORS app PRIVATE src/kscan_sideband_behaviors.c)
 target_sources(app PRIVATE src/matrix_transform.c)
 target_sources(app PRIVATE src/physical_layouts.c)
-target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/key_listener.c)
-target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/main.c)
-target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/input_config.c)
 target_sources(app PRIVATE src/sensors.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/wpm.c)
 target_sources(app PRIVATE src/event_manager.c)
@@ -66,8 +63,6 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON app PRIVATE src/behaviors/behavior_sensor_rotate_common.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_MOUSE_KEY_PRESS app PRIVATE src/behaviors/behavior_mouse_key_press.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_STUDIO_UNLOCK app PRIVATE src/behaviors/behavior_studio_unlock.c)
-  target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/behaviors/behavior_mouse_move.c)
-  target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/behaviors/behavior_mouse_scroll.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_INPUT_TWO_AXIS app PRIVATE src/behaviors/behavior_input_two_axis.c)
   target_sources(app PRIVATE src/combo.c)
   target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c)
diff --git a/app/boards/arm/stp/stp.dts b/app/boards/arm/stp/stp.dts
index 4192d62c803..317d2d1d409 100644
--- a/app/boards/arm/stp/stp.dts
+++ b/app/boards/arm/stp/stp.dts
@@ -24,7 +24,6 @@
         zmk,backlight = &backlight;
         zmk,matrix_transform = &default_transform;
         zmk,battery = &vbatt;
-        zephyr,console = &cdc_acm_uart;
         zmk,profileswitch = &profileswitch;
         zmk,indicators = &led_strip;
     };
@@ -124,11 +123,8 @@
     status = "okay";
 };
 
-&usbd {
+zephyr_udc0: &usbd {
     status = "okay";
-    cdc_acm_uart: cdc_acm_uart {
-    compatible = "zephyr,cdc-acm-uart";
-  };
 };
 
 
diff --git a/app/src/mouse/trackpad.c b/app/src/mouse/trackpad.c
index fea649e6473..5868a2449d9 100644
--- a/app/src/mouse/trackpad.c
+++ b/app/src/mouse/trackpad.c
@@ -273,10 +273,10 @@ static int trackpad_event_listener(const zmk_event_t *eh) {
     return 0;
 }
 
-static ZMK_LISTENER(trackpad, trackpad_event_listener);
-static ZMK_SUBSCRIPTION(trackpad, zmk_endpoint_changed);
-static ZMK_SUBSCRIPTION(trackpad, zmk_usb_conn_state_changed);
-static ZMK_SUBSCRIPTION(trackpad, zmk_ble_active_profile_changed);
+ZMK_LISTENER(trackpad, trackpad_event_listener);
+ZMK_SUBSCRIPTION(trackpad, zmk_endpoint_changed);
+ZMK_SUBSCRIPTION(trackpad, zmk_usb_conn_state_changed);
+ZMK_SUBSCRIPTION(trackpad, zmk_ble_active_profile_changed);
 
 void zmk_trackpad_set_mode_report(uint8_t *report, struct zmk_endpoint_instance endpoint) {
     int profile = zmk_endpoint_instance_to_index(endpoint);