diff --git a/pkg/agentic/epic.go b/pkg/agentic/epic.go
index a55c137..0656515 100644
--- a/pkg/agentic/epic.go
+++ b/pkg/agentic/epic.go
@@ -10,15 +10,15 @@ import (
 )
 
 type EpicInput struct {
-	Repo     string   `json:"repo"`               // Target repo (e.g. "go-scm")
-	Org      string   `json:"org,omitempty"`      // Forge org (default "core")
-	Title    string   `json:"title"`              // Epic title
-	Body     string   `json:"body,omitempty"`     // Epic description (above checklist)
-	Tasks    []string `json:"tasks"`              // Sub-task titles (become child issues)
-	Labels   []string `json:"labels,omitempty"`   // Labels for epic + children (e.g. ["agentic"])
-	Dispatch bool     `json:"dispatch,omitempty"` // Auto-dispatch agents to each child
-	Agent    string   `json:"agent,omitempty"`    // Agent type for dispatch (default "claude")
-	Template string   `json:"template,omitempty"` // Prompt template for dispatch (default "coding")
+	Repo     string   `json:"repo"`
+	Org      string   `json:"org,omitempty"`
+	Title    string   `json:"title"`
+	Body     string   `json:"body,omitempty"`
+	Tasks    []string `json:"tasks"`
+	Labels   []string `json:"labels,omitempty"`
+	Dispatch bool     `json:"dispatch,omitempty"`
+	Agent    string   `json:"agent,omitempty"`
+	Template string   `json:"template,omitempty"`
 }
 
 type EpicOutput struct {
diff --git a/pkg/agentic/pr.go b/pkg/agentic/pr.go
index 10dab3a..1810577 100644
--- a/pkg/agentic/pr.go
+++ b/pkg/agentic/pr.go
@@ -168,10 +168,10 @@ func (s *PrepSubsystem) commentOnIssue(ctx context.Context, org, repo string, is
 
 // input := agentic.ListPRsInput{Org: "core", Repo: "go-io", State: "open", Limit: 10}
 type ListPRsInput struct {
-	Org   string `json:"org,omitempty"`   // forge org (default "core")
-	Repo  string `json:"repo,omitempty"`  // specific repo, or empty for all
-	State string `json:"state,omitempty"` // "open" (default), "closed", "all"
-	Limit int    `json:"limit,omitempty"` // max results (default 20)
+	Org   string `json:"org,omitempty"`
+	Repo  string `json:"repo,omitempty"`
+	State string `json:"state,omitempty"`
+	Limit int    `json:"limit,omitempty"`
 }
 
 // out := agentic.ListPRsOutput{Success: true, Count: 2, PRs: []agentic.PRInfo{{Repo: "go-io", Number: 12}}}
diff --git a/pkg/agentic/verify.go b/pkg/agentic/verify.go
index 82ef418..e1bea12 100644
--- a/pkg/agentic/verify.go
+++ b/pkg/agentic/verify.go
@@ -69,9 +69,9 @@ func (s *PrepSubsystem) autoVerifyAndMerge(workspaceDir string) {
 type mergeResult int
 
 const (
-	mergeSuccess  mergeResult = iota
-	testFailed                // tests didn't pass
-	mergeConflict             // tests passed but merge failed (conflict)
+	mergeSuccess mergeResult = iota
+	testFailed
+	mergeConflict
 )
 
 // s.attemptVerifyAndMerge("/srv/core/workspace/core/go-io/task-5/repo", "core", "go-io", "feature/ax-cleanup", 42)
diff --git a/pkg/agentic/watch.go b/pkg/agentic/watch.go
index 02b1450..69bfd7d 100644
--- a/pkg/agentic/watch.go
+++ b/pkg/agentic/watch.go
@@ -12,12 +12,9 @@ import (
 
 // input := agentic.WatchInput{Workspaces: []string{"core/go-io/task-42"}, PollInterval: 5, Timeout: 600}
 type WatchInput struct {
-	// Workspaces to watch. If empty, watches all running/queued workspaces.
-	Workspaces []string `json:"workspaces,omitempty"`
-	// PollInterval in seconds (default: 5)
-	PollInterval int `json:"poll_interval,omitempty"`
-	// Timeout in seconds (default: 600 = 10 minutes)
-	Timeout int `json:"timeout,omitempty"`
+	Workspaces   []string `json:"workspaces,omitempty"`
+	PollInterval int      `json:"poll_interval,omitempty"`
+	Timeout      int      `json:"timeout,omitempty"`
 }
 
 // out := agentic.WatchOutput{Success: true, Completed: []agentic.WatchResult{{Workspace: "core/go-io/task-42", Status: "completed"}}}
diff --git a/pkg/messages/messages.go b/pkg/messages/messages.go
index d943cac..d50ab29 100644
--- a/pkg/messages/messages.go
+++ b/pkg/messages/messages.go
@@ -15,7 +15,7 @@ type AgentCompleted struct {
 	Agent     string
 	Repo      string
 	Workspace string
-	Status    string // completed, failed, blocked
+	Status    string
 }
 
 // c.ACTION(messages.QAResult{Workspace: "core/go-io/task-5", Repo: "go-io", Passed: true})
diff --git a/pkg/setup/setup.go b/pkg/setup/setup.go
index 86a3f5d..403e00f 100644
--- a/pkg/setup/setup.go
+++ b/pkg/setup/setup.go
@@ -10,10 +10,10 @@ import (
 // result := service.Run(setup.Options{Path: ".", Template: "auto", Force: true})
 // if !result.OK { core.Print(nil, "%v", result.Value) }
 type Options struct {
-	Path     string // Target directory (default: cwd)
-	DryRun   bool   // Preview only, don't write
-	Force    bool   // Overwrite existing files
-	Template string // Workspace template or compatibility alias (default, review, security, agent, go, php, gui, auto)
+	Path     string
+	DryRun   bool
+	Force    bool
+	Template string
 }
 
 // result := service.Run(setup.Options{Path: ".", Template: "auto"})