diff --git a/ai/agent/atomic_engine_part3.go b/ai/agent/atomic_engine_part3.go
index d357885be..f8fbddbf2 100644
--- a/ai/agent/atomic_engine_part3.go
+++ b/ai/agent/atomic_engine_part3.go
@@ -131,14 +131,6 @@ func normalizeCompatibilitySortStep(step map[string]any, argsObj map[string]any)
 	delete(argsObj, "direction")
 }
 
-func normalizeCompatibilityConditionMap(condition map[string]any) map[string]any {
-	return normalizeCompatibilityConditionMapWithQueryAndAliases(condition, "", nil, nil)
-}
-
-func normalizeCompatibilityConditionMapWithQuery(condition map[string]any, currentQuery string) map[string]any {
-	return normalizeCompatibilityConditionMapWithQueryAndAliases(condition, currentQuery, nil, nil)
-}
-
 func normalizeCompatibilityConditionMapWithQueryAndAliases(condition map[string]any, currentQuery string, aliases []string, storeFields map[string]map[string]struct{}) map[string]any {
 	normalized := make(map[string]any, len(condition))
 	for field, raw := range condition {
diff --git a/ai/agent/copilottools.join_execution_extras.go b/ai/agent/copilottools.join_execution_extras.go
index 45bd46ed3..0e6f378a7 100644
--- a/ai/agent/copilottools.join_execution_extras.go
+++ b/ai/agent/copilottools.join_execution_extras.go
@@ -291,17 +291,6 @@ func (c *RightOuterJoinStoreCursor) generateKey(item any, isLeft bool) string {
 	return sb.String()
 }
 
-// Helper for debugging which keys exist
-func getMapKeys(item any) []string {
-	var keys []string
-	if m, ok := item.(map[string]any); ok {
-		for k := range m {
-			keys = append(keys, k)
-		}
-	}
-	return keys
-}
-
 func (c *RightOuterJoinStoreCursor) merge(lItem any, rKey, rVal any) any {
 	// Standard merge of two items (Left + Right)
 	// Similar to JoinRightCursor.mergeResult but stripped down
diff --git a/ai/agent/engine_native.go b/ai/agent/engine_native.go
index 5f142316f..5546e6c01 100644
--- a/ai/agent/engine_native.go
+++ b/ai/agent/engine_native.go
@@ -71,8 +71,6 @@ const (
 	nativeRepairStrategyResearchFirst nativeRepairStrategy = "research_first"
 )
 
-type progressSink func(string)
-
 // Run executes the orchestration loop relying on native tool calls.
 func (e *NativeReActEngine) Run(ctx context.Context, req ai.ReasoningRequest) (ai.ReasoningResponse, error) {
 	if resp, handled, err := handleDirectSlashReasoningRequest(ctx, req); handled {
@@ -2471,18 +2469,6 @@ func shouldEscalateRepairToClarification(repairAttempts int) bool {
 	return repairAttempts >= 1
 }
 
-func isRoutedAskContext(ctx context.Context) bool {
-	p := ai.GetSessionPayload(ctx)
-	if p == nil || p.Variables == nil {
-		return false
-	}
-	routingState, ok := p.Variables["RoutingState"].(*TaskContextClassification)
-	if !ok || routingState == nil {
-		return false
-	}
-	return strings.TrimSpace(routingState.RoutingGate) != ""
-}
-
 func shouldResetRepairAttempts(priorRepair *pendingToolRepair, toolName string) bool {
 	if priorRepair == nil {
 		return true