diff --git a/.github/workflows/test-module-generation.yml b/.github/workflows/test-module-generation.yml
index fa41c5d1757..ff8579f2a68 100644
--- a/.github/workflows/test-module-generation.yml
+++ b/.github/workflows/test-module-generation.yml
@@ -2,10 +2,13 @@ name: Test Template Generators
 
 on:
   workflow_dispatch:
+  pull_request:
+    branches:
+      - main
 
 jobs:
   generate_and_run_module:
-    if: github.repository_owner == 'viamrobotics'
+    # if: github.repository_owner == 'viamrobotics'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
diff --git a/cli/app.go b/cli/app.go
index a498a0365bc..979d05e228a 100644
--- a/cli/app.go
+++ b/cli/app.go
@@ -1893,7 +1893,6 @@ var app = &cli.App{
 							Name:      "status",
 							Usage:     "display part status",
 							UsageText: createUsageText("machines part status", []string{generalFlagPart}, true, false),
-							// TODO(RSDK-9286) do we need to ask for og and location and machine and part here?
 							Flags: []cli.Flag{
 								&AliasStringFlag{
 									cli.StringFlag{