diff --git a/cli/app/app.go b/cli/app/app.go
index 830d45be..8e4f1dba 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -4,17 +4,12 @@ import (
 	"github.com/urfave/cli"
 )
 
-// AppCommand defines the `abra app` command and ets subcommands
 var AppCommand = cli.Command{
-	Name:      "app",
-	Aliases:   []string{"a"},
-	Usage:     "Manage apps",
-	ArgsUsage: "<app>",
-	Description: `
-This command provides all the functionality you need to manage the life cycle
-of your apps. From initial deployment to day-2 operations to scaling apps up
-and spinning them down.
-`,
+	Name:        "app",
+	Aliases:     []string{"a"},
+	Usage:       "Manage apps",
+	ArgsUsage:   "<app>",
+	Description: "This command provides functionality for managing the life cycle of your apps",
 	Subcommands: []cli.Command{
 		appNewCommand,
 		appConfigCommand,
diff --git a/cli/app/rollback.go b/cli/app/rollback.go
index afbfb935..35bb4e2e 100644
--- a/cli/app/rollback.go
+++ b/cli/app/rollback.go
@@ -38,7 +38,7 @@ You may pass "--force/-f" to downgrade to the same version again. This can be
 useful if the container runtime has gotten into a weird state.
 
 This action could be destructive, please ensure you have a copy of your app
-data beforehand - see "abra app backup <app>" for more.
+data beforehand.
 
 Chas mode ("--chaos") will deploy your local checkout of a recipe as-is,
 including unstaged changes and can be useful for live hacking and testing new
diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go
index fad96f93..0ea4bab9 100644
--- a/cli/app/upgrade.go
+++ b/cli/app/upgrade.go
@@ -42,7 +42,7 @@ You may pass "--force/-f" to upgrade to the same version again. This can be
 useful if the container runtime has gotten into a weird state.
 
 This action could be destructive, please ensure you have a copy of your app
-data beforehand - see "abra app backup <app>" for more.
+data beforehand.
 
 Chas mode ("--chaos") will deploy your local checkout of a recipe as-is,
 including unstaged changes and can be useful for live hacking and testing new
diff --git a/cli/record/remove.go b/cli/record/remove.go
index 58e0ee2d..d3519f2d 100644
--- a/cli/record/remove.go
+++ b/cli/record/remove.go
@@ -41,7 +41,7 @@ Example:
 
     abra record remove foo.com -p gandi -t A -n myapp
 
-You may also invoke this command in "wizard" mode and be prompted for input
+You may also invoke this command in "wizard" mode and be prompted for input:
 
     abra record rm
 `,
diff --git a/cli/server/new.go b/cli/server/new.go
index 07b770c4..2928a28b 100644
--- a/cli/server/new.go
+++ b/cli/server/new.go
@@ -111,9 +111,6 @@ bar.example.com).
     @  1800 IN A %s
     *  1800 IN A %s
 
-"abra record new --auto" can help you do this quickly if you use a supported
-DNS provider.
-
 	`,
 		internal.HetznerCloudName, ip, rootPassword,
 		ip, ip, ip,