diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 4a592e381..f32c213c9 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -58,7 +58,6 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   target_sources(app PRIVATE src/behaviors/behavior_mod_morph.c)
   target_sources(app PRIVATE src/behaviors/behavior_outputs.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_LAST_DEVICE app PRIVATE src/behaviors/behavior_last_device.c)
-  target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c)
   target_sources(app PRIVATE src/behaviors/behavior_toggle_layer.c)
   target_sources(app PRIVATE src/behaviors/behavior_to_layer.c)
   target_sources(app PRIVATE src/behaviors/behavior_transparent.c)
diff --git a/app/Kconfig b/app/Kconfig
index 2bc248c9f..770c6ee1c 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -692,11 +692,6 @@ config ZMK_KEYMAP_SENSORS_DEFAULT_TRIGGERS_PER_ROTATION
 
 endif # ZMK_KEYMAP_SENSORS
 
-choice CBPRINTF_IMPLEMENTATION
-    default CBPRINTF_NANO
-
-endchoice
-
 module = ZMK
 module-str = zmk
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/app/src/behaviors/behavior_last_device.c b/app/src/behaviors/behavior_last_device.c
index a18ae7486..d61905030 100644
--- a/app/src/behaviors/behavior_last_device.c
+++ b/app/src/behaviors/behavior_last_device.c
@@ -91,7 +91,8 @@ ZMK_SUBSCRIPTION(last_device_listener, zmk_endpoint_changed);
 ZMK_SUBSCRIPTION(last_device_listener, zmk_ble_active_profile_changed);
 
 #define LAST_DEVICE_INST(n)                                                                        \
-    BEHAVIOR_DT_INST_DEFINE(n, behavior_last_device_init, NULL, NULL, NULL, POST_KERNEL,             \
-                          CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_last_device_driver_api);
+    BEHAVIOR_DT_INST_DEFINE(n, behavior_last_device_init, NULL, NULL, NULL, POST_KERNEL,           \
+                            CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,                                   \
+                            &behavior_last_device_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(LAST_DEVICE_INST)
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index b5bff8b9b..2e2df322d 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -31,9 +31,7 @@ static struct zmk_endpoint_instance last_instance = {};
 static enum zmk_transport preferred_transport =
     ZMK_TRANSPORT_USB; /* Used if multiple endpoints are ready */
 
-int zmk_preferred_transport() {
-    return preferred_transport;
-}
+int zmk_preferred_transport() { return preferred_transport; }
 
 static void update_current_endpoint(void);