diff --git a/cli/kv_command.go b/cli/kv_command.go
index 9d89b9c1..5d34f6ac 100644
--- a/cli/kv_command.go
+++ b/cli/kv_command.go
@@ -326,12 +326,7 @@ func (c *kvCommand) deleteAction(_ *kingpin.ParseContext) error {
 }
 
 func (c *kvCommand) addAction(_ *kingpin.ParseContext) error {
-	nc, _, err := prepareHelper("", natsOpts()...)
-	if err != nil {
-		return err
-	}
-
-	js, err := nc.JetStream()
+	_, js, err := prepareJSHelper()
 	if err != nil {
 		return err
 	}
diff --git a/cli/stream_command.go b/cli/stream_command.go
index d03b3a77..1033c547 100644
--- a/cli/stream_command.go
+++ b/cli/stream_command.go
@@ -1894,8 +1894,6 @@ func (c *streamCmd) validateCfg(cfg *api.StreamConfig) (bool, []byte, []string,
 func (c *streamCmd) addAction(pc *kingpin.ParseContext) (err error) {
 	cfg := c.prepareConfig(pc)
 
-	fmt.Printf("cfg: %#v\n", cfg)
-
 	switch {
 	case c.validateOnly:
 		valid, j, errs, err := c.validateCfg(&cfg)
@@ -1923,12 +1921,9 @@ func (c *streamCmd) addAction(pc *kingpin.ParseContext) (err error) {
 		return ioutil.WriteFile(c.outFile, j, 0644)
 	}
 
-	log.Printf("options: %#v\n", opts)
-	log.Printf("preparing helper %#v\n", natsOpts())
 	_, mgr, err := prepareHelper("", natsOpts()...)
 	kingpin.FatalIfError(err, "could not create Stream")
 
-	log.Printf("mgr: %v\n", mgr)
 	str, err := mgr.NewStreamFromDefault(c.stream, cfg)
 	kingpin.FatalIfError(err, "could not create Stream")