diff --git a/coderd/x/chatd/chatutil/chatutil.go b/coderd/x/chatd/chatutil/chatutil.go
index 9158fbb598..b0ad218e24 100644
--- a/coderd/x/chatd/chatutil/chatutil.go
+++ b/coderd/x/chatd/chatutil/chatutil.go
@@ -1,6 +1,10 @@
 package chatutil
 
-import "strings"
+import (
+	"strings"
+
+	stringutil "github.com/coder/coder/v2/coderd/util/strings"
+)
 
 // NormalizedStringPointer trims a string pointer and returns nil for nil or
 // empty values.
@@ -8,11 +12,7 @@ func NormalizedStringPointer(value *string) *string {
 	if value == nil {
 		return nil
 	}
-	trimmed := strings.TrimSpace(*value)
-	if trimmed == "" {
-		return nil
-	}
-	return &trimmed
+	return stringutil.EmptyToNil(strings.TrimSpace(*value))
 }
 
 // NormalizedEnumValue returns the canonical allowed value matching value after
diff --git a/coderd/x/chatd/model_routing.go b/coderd/x/chatd/model_routing.go
index 6300a09465..8e57e78598 100644
--- a/coderd/x/chatd/model_routing.go
+++ b/coderd/x/chatd/model_routing.go
@@ -52,31 +52,6 @@ func (p *Server) enabledAIProviderByID(ctx context.Context, providerID uuid.UUID
 	return provider, nil
 }
 
-func (p *Server) resolveModelRouteForConfig(
-	ctx context.Context,
-	ownerID uuid.UUID,
-	modelConfig database.ChatModelConfig,
-) (aiGatewayModelRoute, error) {
-	return p.resolveAIGatewayModelRouteForConfig(ctx, ownerID, modelConfig)
-}
-
-func (p *Server) resolveModelRouteForProviderType(
-	ctx context.Context,
-	ownerID uuid.UUID,
-	providerType string,
-) (aiGatewayModelRoute, error) {
-	return p.resolveAIGatewayModelRouteForProviderType(ctx, ownerID, providerType)
-}
-
-func (p *Server) newModel(
-	ctx context.Context,
-	req modelClientRequest,
-	route aiGatewayModelRoute,
-	opts modelBuildOptions,
-) (fantasy.LanguageModel, error) {
-	return p.newAIGatewayModel(ctx, req, route, opts)
-}
-
 func newLanguageModel(
 	providerHint string,
 	modelName string,
diff --git a/coderd/x/chatd/model_routing_aibridge.go b/coderd/x/chatd/model_routing_aibridge.go
index 57c6838028..3179ab4ea5 100644
--- a/coderd/x/chatd/model_routing_aibridge.go
+++ b/coderd/x/chatd/model_routing_aibridge.go
@@ -110,7 +110,7 @@ func isOpenRouterLikeAIGatewayProvider(provider database.AIProvider) bool {
 	return host == "openrouter.ai" || strings.HasSuffix(host, ".openrouter.ai")
 }
 
-func (p *Server) newAIGatewayModel(
+func (p *Server) newModel(
 	_ context.Context,
 	req modelClientRequest,
 	route aiGatewayModelRoute,
@@ -267,7 +267,7 @@ func (p *Server) resolveAIGatewayRoute(
 	return newAIGatewayModelRoute(provider, modelProviderHint, auth), nil
 }
 
-func (p *Server) resolveAIGatewayModelRouteForConfig(
+func (p *Server) resolveModelRouteForConfig(
 	ctx context.Context,
 	ownerID uuid.UUID,
 	modelConfig database.ChatModelConfig,
@@ -279,7 +279,7 @@ func (p *Server) resolveAIGatewayModelRouteForConfig(
 	return p.resolveAIGatewayRoute(ctx, ownerID, provider, string(provider.Type))
 }
 
-func (p *Server) resolveAIGatewayModelRouteForProviderType(
+func (p *Server) resolveModelRouteForProviderType(
 	ctx context.Context,
 	ownerID uuid.UUID,
 	providerType string,
diff --git a/coderd/x/chatd/title_override.go b/coderd/x/chatd/title_override.go
index f58ec0a17d..2d48b3c714 100644
--- a/coderd/x/chatd/title_override.go
+++ b/coderd/x/chatd/title_override.go
@@ -54,18 +54,7 @@ func (p *Server) resolveTitleGenerationModelOverride(
 		chat.OwnerID,
 		p.resolveModelConfigAndNormalizedProvider,
 		func(ctx context.Context, ownerID uuid.UUID, aiProviderID uuid.UUID) (chatprovider.ProviderAPIKeys, error) {
-			if aiProviderID == uuid.Nil {
-				resolvedProviderKeys, err := p.resolveUserProviderAPIKeys(ctx, ownerID, uuid.Nil)
-				if err != nil {
-					return chatprovider.ProviderAPIKeys{}, err
-				}
-				return resolvedProviderKeys, nil
-			}
-			resolvedProviderKeys, err := p.resolveUserProviderAPIKeys(ctx, ownerID, aiProviderID)
-			if err != nil {
-				return chatprovider.ProviderAPIKeys{}, err
-			}
-			return resolvedProviderKeys, nil
+			return p.resolveUserProviderAPIKeys(ctx, ownerID, aiProviderID)
 		},
 		modelOverrideFailureModeHard,
 	)