diff --git a/js/apps/system/aardvark/frontend/js/client/client.js b/js/apps/system/aardvark/frontend/js/client/client.js
index 170d904dc7..77233c40a3 100644
--- a/js/apps/system/aardvark/frontend/js/client/client.js
+++ b/js/apps/system/aardvark/frontend/js/client/client.js
@@ -57,14 +57,14 @@ function stop_pager () {
 function help () {
   var internal = require("internal");
   var arangodb = require("org/arangodb");
-  var client = require("org/arangodb/arangosh");
+  var arangosh = require("org/arangodb/arangosh");
 
-  internal.print(client.HELP);
+  internal.print(arangosh.HELP);
   arangodb.ArangoDatabase.prototype._help();
   arangodb.ArangoCollection.prototype._help();
   arangodb.ArangoStatement.prototype._help();
   arangodb.ArangoQueryCursor.prototype._help();
-  internal.print(client.helpExtended);
+  internal.print(arangosh.helpExtended);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -152,7 +152,7 @@ var Buffer = require("buffer").Buffer;
   if (internal.quiet !== true && ! special) {
     if (typeof internal.arango !== "undefined") {
       if (typeof internal.arango.isConnected !== "undefined" && internal.arango.isConnected()) {
-        internal.print(arangosh.HELP);
+        internal.print("use 'help' to see common examples");
       }
     }
   }
diff --git a/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arangosh.js b/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arangosh.js
index 786ab435a7..761c6d630a 100644
--- a/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arangosh.js
+++ b/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arangosh.js
@@ -40,11 +40,6 @@ var internal = require("internal");
 // --SECTION--                                                 private functions
 // -----------------------------------------------------------------------------
 
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoShell
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief return a formatted type string for object
 /// 
@@ -117,19 +112,10 @@ exports.checkRequestResult = function (requestResult) {
   return copy;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 private variables
 // -----------------------------------------------------------------------------
 
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoShell
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief general help
 ////////////////////////////////////////////////////////////////////////////////
@@ -192,10 +178,6 @@ exports.helpExtended = exports.createHelpHeadline("More help") +
   '                                        and without colors          ' + "\n" +
   ' > clear()                              clear screen                ' ;
 
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE
 // -----------------------------------------------------------------------------
diff --git a/js/client/client.js b/js/client/client.js
index 170d904dc7..77233c40a3 100644
--- a/js/client/client.js
+++ b/js/client/client.js
@@ -57,14 +57,14 @@ function stop_pager () {
 function help () {
   var internal = require("internal");
   var arangodb = require("org/arangodb");
-  var client = require("org/arangodb/arangosh");
+  var arangosh = require("org/arangodb/arangosh");
 
-  internal.print(client.HELP);
+  internal.print(arangosh.HELP);
   arangodb.ArangoDatabase.prototype._help();
   arangodb.ArangoCollection.prototype._help();
   arangodb.ArangoStatement.prototype._help();
   arangodb.ArangoQueryCursor.prototype._help();
-  internal.print(client.helpExtended);
+  internal.print(arangosh.helpExtended);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -152,7 +152,7 @@ var Buffer = require("buffer").Buffer;
   if (internal.quiet !== true && ! special) {
     if (typeof internal.arango !== "undefined") {
       if (typeof internal.arango.isConnected !== "undefined" && internal.arango.isConnected()) {
-        internal.print(arangosh.HELP);
+        internal.print("use 'help' to see common examples");
       }
     }
   }
diff --git a/js/client/modules/org/arangodb/arangosh.js b/js/client/modules/org/arangodb/arangosh.js
index daf7e90369..f84ebaad3e 100644
--- a/js/client/modules/org/arangodb/arangosh.js
+++ b/js/client/modules/org/arangodb/arangosh.js
@@ -39,11 +39,6 @@ var internal = require("internal");
 // --SECTION--                                                 private functions
 // -----------------------------------------------------------------------------
 
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoShell
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief return a formatted type string for object
 /// 
@@ -116,19 +111,10 @@ exports.checkRequestResult = function (requestResult) {
   return copy;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 private variables
 // -----------------------------------------------------------------------------
 
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoShell
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief general help
 ////////////////////////////////////////////////////////////////////////////////
@@ -191,10 +177,6 @@ exports.helpExtended = exports.createHelpHeadline("More help") +
   '                                        and without colors          ' + "\n" +
   ' > clear()                              clear screen                ' ;
 
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE
 // -----------------------------------------------------------------------------