diff --git a/agents/anvillm-agent.conf b/agents/anvillm-agent.json
similarity index 100%
rename from agents/anvillm-agent.conf
rename to agents/anvillm-agent.json
diff --git a/agents/default.json b/agents/default.json
index 87134db..4ab0ce3 100644
--- a/agents/default.json
+++ b/agents/default.json
@@ -1,14 +1,6 @@
 {
 	"prompt": "",
-	"mcpServers": {
-		"superpowers-mcp-server": {
-			"command": "superpowers-mcp-server",
-			"args": [],
-			"env": {
-				"SUPERPOWERD_SESSION_TOKEN": "${SUPERPOWERD_SESSION_TOKEN}"
-			}
-		}
-	},
+	"mcpServers": {},
 	"hooks": {
 		"agentSpawn": "true",
 		"userPromptSubmit": "true",
diff --git a/main.go b/main.go
index 9941623..cb23701 100644
--- a/main.go
+++ b/main.go
@@ -257,9 +257,6 @@ func main() {
 	}
 
 	modelName := os.Getenv("OLLIE_MODEL")
-	if modelName == "" && len(os.Args) > 1 {
-		modelName = os.Args[1]
-	}
 	if modelName == "" {
 		modelName = "qwen3:8b"
 	}
@@ -267,7 +264,6 @@ func main() {
 	// Resolve after backend.New() so that loadEnvFile has already run and
 	// populated OLLIE_BACKEND / OLLIE_OPENAI_URL from ~/.config/ollie/env.
 	backendName := resolveBackendName()
-
 	builtinExec := execpkg.New(
 		home+"/.local/state/ollie",
 		home+"/.cache/ollie/exec",
@@ -278,8 +274,8 @@ func main() {
 	if agentName == "" {
 		agentName = "default"
 	}
-	if len(os.Args) > 2 {
-		agentName = os.Args[2]
+	if len(os.Args) > 1 {
+		agentName = os.Args[1]
 	}
 	cfgPath := agentConfigPath(agentsDir, agentName)
 	cfg, cfgErr := config.Load(cfgPath)