diff --git a/client/maxctrl/lib/clear.js b/client/maxctrl/lib/clear.js
index dd213e313..9e62ba678 100644
--- a/client/maxctrl/lib/clear.js
+++ b/client/maxctrl/lib/clear.js
@@ -21,8 +21,9 @@ exports.builder = function(yargs) {
             var target = 'servers/' + argv.server + "/clear?status=" + argv.status
             doRequest(target, null, {method: "POST"})
         })
+        .usage("Usage: clear <command>")
+        .help()
         .command('*', 'the default command', {}, () => {
             console.log("Unknown command. See output of 'help clear' for a list of commands.")
         })
-        .help()
 }
diff --git a/client/maxctrl/lib/list.js b/client/maxctrl/lib/list.js
index 36f80fa6b..8d1ba4e44 100644
--- a/client/maxctrl/lib/list.js
+++ b/client/maxctrl/lib/list.js
@@ -65,8 +65,9 @@ exports.builder = function(yargs) {
                 {'Version': 'attributes.version'}
             ])
         })
+        .usage("Usage: list <command>")
+        .help()
         .command('*', 'the default command', {}, () => {
             console.log("Unknown command. See output of 'help list' for a list of commands.")
         })
-    .help()
 }
diff --git a/client/maxctrl/lib/set.js b/client/maxctrl/lib/set.js
index b41904cc9..30e67c552 100644
--- a/client/maxctrl/lib/set.js
+++ b/client/maxctrl/lib/set.js
@@ -21,8 +21,9 @@ exports.builder = function(yargs) {
             var target = 'servers/' + argv.server + "/set?status=" + argv.status
             doRequest(target, null, {method: "POST"})
         })
+        .usage("Usage: set <command>")
+        .help()
         .command('*', 'the default command', {}, () => {
             console.log("Unknown command. See output of 'help set' for a list of commands.")
         })
-    .help()
 }
diff --git a/client/maxctrl/lib/show.js b/client/maxctrl/lib/show.js
index 1c953c1ef..ceb68a8c5 100644
--- a/client/maxctrl/lib/show.js
+++ b/client/maxctrl/lib/show.js
@@ -83,8 +83,9 @@ exports.builder = function(yargs) {
                 {'Commands': 'attributes.commands'}
             ])
         })
+        .usage("Usage: show <command>")
+        .help()
         .command('*', 'the default command', {}, () => {
             console.log("Unknown command. See output of 'help show' for a list of commands.")
         })
-    .help()
 }
diff --git a/client/maxctrl/maxctrl.js b/client/maxctrl/maxctrl.js
index c4e8d0442..af9cd34e6 100644
--- a/client/maxctrl/maxctrl.js
+++ b/client/maxctrl/maxctrl.js
@@ -54,7 +54,6 @@ program
     .command(require('./lib/show.js'))
     .command(require('./lib/set.js'))
     .command(require('./lib/clear.js'))
-    .recommendCommands()
     .help()
     .demandCommand(1, 'At least one command is required')
     .command('*', 'the default command', {}, () => {