diff --git a/src/app/app.cmake b/src/app/app.cmake
index b698c61f..f2e7adcb 100644
--- a/src/app/app.cmake
+++ b/src/app/app.cmake
@@ -81,12 +81,19 @@ target_link_libraries(yaze PRIVATE
   yaze_emulator
   yaze_emulator_ui
   yaze_agent
-  yaze_grpc_support
   absl::failure_signal_handler
   absl::flags
   absl::flags_parse
 )
 # gRPC/protobuf linking is now handled by yaze_grpc_support library
+if(YAZE_ENABLE_REMOTE_AUTOMATION)
+  if(TARGET yaze_grpc_support)
+    target_link_libraries(yaze PRIVATE yaze_grpc_support)
+    message(STATUS "✓ yaze executable linked to yaze_grpc_support")
+  else()
+    message(FATAL_ERROR "YAZE_ENABLE_REMOTE_AUTOMATION=ON but yaze_grpc_support target missing")
+  endif()
+endif()
 
 # Link test support library (yaze_editor needs TestManager)
 if(TARGET yaze_test_support)
diff --git a/src/app/editor/layout/layout_presets.h b/src/app/editor/layout/layout_presets.h
index f8bf5ee3..7e16ece1 100644
--- a/src/app/editor/layout/layout_presets.h
+++ b/src/app/editor/layout/layout_presets.h
@@ -133,9 +133,6 @@ class LayoutPresets {
    */
   static PanelLayoutPreset GetAudioPreset();
 
-  // Legacy alias to ease Panel → Panel migration; prefer PanelLayoutPreset.
-  using PanelLayoutPreset = PanelLayoutPreset;
-
   // ============================================================================
   // Panel ID Constants - synced with actual editor registrations
   // ============================================================================
@@ -229,4 +226,3 @@ class LayoutPresets {
 }  // namespace yaze
 
 #endif  // YAZE_APP_EDITOR_LAYOUT_LAYOUT_PRESETS_H_
-