diff --git a/cmd/query.go b/cmd/query.go
index 6a50f066..08bec108 100644
--- a/cmd/query.go
+++ b/cmd/query.go
@@ -119,6 +119,5 @@ func setExitCodeForQueryError(err error) {
 		return
 	}
 
-	// TODO #errors - assign exit codes https://github.com/turbot/tailpipe/issues/496
 	exitCode = 1
 }
diff --git a/internal/cmdconfig/cmd_hooks.go b/internal/cmdconfig/cmd_hooks.go
index 503435b2..78e5b478 100644
--- a/internal/cmdconfig/cmd_hooks.go
+++ b/internal/cmdconfig/cmd_hooks.go
@@ -46,7 +46,6 @@ func preRunHook(cmd *cobra.Command, args []string) error {
 	ew := initGlobalConfig(ctx)
 	// display any warnings
 	ew.ShowWarnings()
-	// TODO #errors sort exit code  https://github.com/turbot/tailpipe/issues/496
 	// check for error
 	error_helpers.FailOnError(ew.Error)
 
diff --git a/internal/database/duck_db.go b/internal/database/duck_db.go
index f35756c3..a6f5fcb2 100644
--- a/internal/database/duck_db.go
+++ b/internal/database/duck_db.go
@@ -285,10 +285,7 @@ func GetDucklakeInitCommands(readonly bool) []SqlCommand {
 
 	commands := []SqlCommand{
 		{Description: "install sqlite extension", Command: "install sqlite"},
-		// TODO #DL change to using prod extension when stable
-		//  https://github.com/turbot/tailpipe/issues/476
-		// _, err = db.Exec("install ducklake;")
-		{Description: "install ducklake extension", Command: "force install ducklake from core_nightly"},
+		{Description: "install ducklake extension", Command: "install ducklake;"},
 		{Description: "attach to ducklake database", Command: attachQuery},
 	}
 	return commands
diff --git a/internal/parse/load_config_test.go b/internal/parse/load_config_test.go
index cb600da0..d4e97ddc 100644
--- a/internal/parse/load_config_test.go
+++ b/internal/parse/load_config_test.go
@@ -496,7 +496,6 @@ func TestParseTailpipeConfig(t *testing.T) {
 		want    *config.TailpipeConfig
 		wantErr bool
 	}{
-		// TODO #testing add more test cases https://github.com/turbot/tailpipe/issues/506
 		{
 			name: "static tables",
 			args: args{
@@ -868,4 +867,4 @@ func TestParseTailpipeConfig(t *testing.T) {
 
 		})
 	}
-}
\ No newline at end of file
+}
diff --git a/internal/plugin/plugin_manager.go b/internal/plugin/plugin_manager.go
index 765e790e..0080f265 100644
--- a/internal/plugin/plugin_manager.go
+++ b/internal/plugin/plugin_manager.go
@@ -617,7 +617,6 @@ func loadPluginVersionFile(ctx context.Context) (*versionfile.PluginVersionFile,
 		return nil, err
 	}
 
-	// TODO CHECK THIS https://github.com/turbot/tailpipe/issues/507
 	// add any "local" plugins (i.e. plugins installed under the 'local' folder) into the version file
 	ew := pluginVersions.AddLocalPlugins(ctx)
 	if ew.Error != nil {