diff --git a/.gitignore b/.gitignore
index 1e35a9d..7e84c7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,7 @@ samples/agent-support-service/smoke-server-8087.log
 samples/agent-support-service/smoke-relay-managed.out
 samples/agent-support-service/smoke-latest.out
 .gitignore
+**/*.class
+mvnw
+mvnw.cmd
+.mvn/
diff --git a/mvnw b/mvnw
deleted file mode 100755
index 1a198cd..0000000
--- a/mvnw
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-if [ -n "${MVN_CMD:-}" ] && [ -x "${MVN_CMD}" ]; then
-  exec "${MVN_CMD}" "$@"
-fi
-
-if [ -n "${MAVEN_HOME:-}" ] && [ -x "${MAVEN_HOME}/bin/mvn" ]; then
-  exec "${MAVEN_HOME}/bin/mvn" "$@"
-fi
-
-if command -v mvn >/dev/null 2>&1; then
-  exec mvn "$@"
-fi
-
-if [ -x "/Users/roman/.sdkman/candidates/maven/current/bin/mvn" ]; then
-  exec "/Users/roman/.sdkman/candidates/maven/current/bin/mvn" "$@"
-fi
-
-echo "Error: Maven executable not found. Set MVN_CMD, MAVEN_HOME, or install Maven on PATH." >&2
-exit 1
diff --git a/mvnw.cmd b/mvnw.cmd
deleted file mode 100644
index 86e3e23..0000000
--- a/mvnw.cmd
+++ /dev/null
@@ -1,26 +0,0 @@
-@echo off
-setlocal
-
-if defined MVN_CMD if exist "%MVN_CMD%" (
-  "%MVN_CMD%" %*
-  exit /b %ERRORLEVEL%
-)
-
-if defined MAVEN_HOME if exist "%MAVEN_HOME%\bin\mvn.cmd" (
-  "%MAVEN_HOME%\bin\mvn.cmd" %*
-  exit /b %ERRORLEVEL%
-)
-
-where mvn >nul 2>nul
-if %ERRORLEVEL% EQU 0 (
-  mvn %*
-  exit /b %ERRORLEVEL%
-)
-
-if exist "C:\Users\roman\.sdkman\candidates\maven\current\bin\mvn.cmd" (
-  "C:\Users\roman\.sdkman\candidates\maven\current\bin\mvn.cmd" %*
-  exit /b %ERRORLEVEL%
-)
-
-echo Error: Maven executable not found. Set MVN_CMD or MAVEN_HOME, or install Maven on PATH. 1>&2
-exit /b 1
diff --git a/samples/agent-support-service/src/main/java/io/dscope/camel/agent/samples/SampleAdminMcpBindings.java b/samples/agent-support-service/src/main/java/io/dscope/camel/agent/samples/SampleAdminMcpBindings.java
index 2fd03d2..e4bc4ea 100644
--- a/samples/agent-support-service/src/main/java/io/dscope/camel/agent/samples/SampleAdminMcpBindings.java
+++ b/samples/agent-support-service/src/main/java/io/dscope/camel/agent/samples/SampleAdminMcpBindings.java
@@ -1,7 +1,6 @@
 package io.dscope.camel.agent.samples;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.lang.reflect.Field;
 import java.util.Properties;
 import org.apache.camel.main.Main;
 
@@ -131,7 +130,7 @@ static void bindIfMissing(Main main, String applicationYamlPath) {
 
     private static void ensureAuditProcessors(Main main, String applicationYamlPath, ObjectMapper objectMapper) throws Exception {
         Object persistenceFacade = required(main, "persistenceFacade");
-        Object planSelectionResolver = lookupFromRegistry(main, "agentPlanSelectionResolver");
+        Object planSelectionResolver = main.lookup("agentPlanSelectionResolver", Object.class);
         if (planSelectionResolver == null) {
             planSelectionResolver = newInstance(
                 "io.dscope.camel.agent.runtime.AgentPlanSelectionResolver",
@@ -141,7 +140,7 @@ private static void ensureAuditProcessors(Main main, String applicationYamlPath,
             main.bind("agentPlanSelectionResolver", planSelectionResolver);
         }
 
-        Object conversationArchiveService = lookupFromRegistry(main, "conversationArchiveService");
+        Object conversationArchiveService = main.lookup("conversationArchiveService", Object.class);
         if (conversationArchiveService == null) {
             conversationArchiveService = newInstance(
                 "io.dscope.camel.agent.runtime.ConversationArchiveService",
@@ -151,7 +150,7 @@ private static void ensureAuditProcessors(Main main, String applicationYamlPath,
             main.bind("conversationArchiveService", conversationArchiveService);
         }
 
-        Object runtimeControlState = lookupFromRegistry(main, "runtimeControlState");
+        Object runtimeControlState = main.lookup("runtimeControlState", Object.class);
         if (runtimeControlState == null) {
             runtimeControlState = newInstance(
                 "io.dscope.camel.agent.runtime.RuntimeControlState",
@@ -240,7 +239,7 @@ private static void ensureAuditProcessors(Main main, String applicationYamlPath,
     }
 
     private static void bindIfMissing(Main main, String name, Object value) {
-        if (lookupFromRegistry(main, name) == null && main.lookup(name, Object.class) == null) {
+        if (main.lookup(name, Object.class) == null) {
             main.bind(name, value);
         }
     }
@@ -279,38 +278,18 @@ private static String trimToNull(String value) {
     }
 
     private static Object lookup(Main main, String name) {
-        Object value = lookupFromRegistry(main, name);
-        if (value == null) {
-            value = main.lookup(name, Object.class);
-        }
+        Object value = main.lookup(name, Object.class);
         return value != null ? value : new ObjectMapper();
     }
 
     private static Object required(Main main, String name) {
-        Object value = lookupFromRegistry(main, name);
-        if (value == null) {
-            value = main.lookup(name, Object.class);
-        }
+        Object value = main.lookup(name, Object.class);
         if (value == null) {
             throw new IllegalStateException("Required bean missing after runtime bootstrap: " + name);
         }
         return value;
     }
 
-    private static Object lookupFromRegistry(Main main, String name) {
-        try {
-            Field registryField = Main.class.getDeclaredField("registry");
-            registryField.setAccessible(true);
-            Object registry = registryField.get(main);
-            if (registry == null) {
-                return null;
-            }
-            return registry.getClass().getMethod("lookupByName", String.class).invoke(registry, name);
-        } catch (Exception ignored) {
-            return null;
-        }
-    }
-
     private static Object newInstance(String className) throws Exception {
         return Class.forName(className).getDeclaredConstructor().newInstance();
     }