Index: uspace/app/bdsh/cmds/modules/cat/cat_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/cat/cat_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,5 +4,4 @@
 	&cmd_cat,
 	&help_cmd_cat,
-	0
 },
 
Index: uspace/app/bdsh/cmds/modules/cp/cp_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/cp/cp_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,5 +4,4 @@
 	&cmd_cp,
 	&help_cmd_cp,
-	0
 },
 
Index: uspace/app/bdsh/cmds/modules/help/help.c
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.c	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/help/help.c	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -134,5 +134,4 @@
 	/* First, show a list of built in commands that are available in this mode */
 	for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
-		if (!builtin_is_restricted(i)) {
 			if (is_builtin_alias(cmd->name))
 				printf("   %-16s\tAlias for `%s'\n", cmd->name,
@@ -140,5 +139,4 @@
 			else
 				printf("   %-16s\t%s\n", cmd->name, cmd->desc);
-		}
 	}
 
@@ -147,5 +145,4 @@
 	/* Now, show a list of module commands that are available in this mode */
 	for (mod = modules; mod->name != NULL; mod++, i++) {
-		if (!module_is_restricted(i)) {
 			if (is_module_alias(mod->name))
 				printf("   %-16s\tAlias for `%s'\n", mod->name,
@@ -153,5 +150,4 @@
 			else
 				printf("   %-16s\t%s\n", mod->name, mod->desc);
-		}
 	}
 
Index: uspace/app/bdsh/cmds/modules/help/help_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/help/help_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,4 +4,3 @@
 	&cmd_help,
 	&help_cmd_help,
-	0
 },
Index: uspace/app/bdsh/cmds/modules/ls/ls_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/ls/ls_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,13 +4,3 @@
 	&cmd_ls,
 	&help_cmd_ls,
-	0
 },
-
-{
-	"dir",
-	NULL,
-	&cmd_ls,
-	&help_cmd_ls,
-	0
-},
-
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,13 +4,5 @@
 	&cmd_mkdir,
 	&help_cmd_mkdir,
-	0
 },
 
-{
-	"md",
-	NULL,
-	&cmd_mkdir,
-	&help_cmd_mkdir,
-	0
-},
 
Index: uspace/app/bdsh/cmds/modules/module_aliases.h
===================================================================
--- uspace/app/bdsh/cmds/modules/module_aliases.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/module_aliases.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -13,8 +13,4 @@
 
 char *mod_aliases[] = {
-	"exit", "quit",
-	"md", "mkdir",
-	"del", "rm",
-	"dir", "ls",
 	NULL, NULL
 };
Index: uspace/app/bdsh/cmds/modules/pwd/pwd_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/pwd/pwd_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/pwd/pwd_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,4 +4,3 @@
 	&cmd_pwd,
 	&help_cmd_pwd,
-	-1
 },
Index: uspace/app/bdsh/cmds/modules/quit/quit.c
===================================================================
--- uspace/app/bdsh/cmds/modules/quit/quit.c	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/quit/quit.c	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -35,5 +35,5 @@
 #include "cmds.h"
 
-static char *cmdname = "quit";
+static char *cmdname = "exit";
 
 extern volatile unsigned int cli_quit;
Index: uspace/app/bdsh/cmds/modules/quit/quit_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/quit/quit_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/quit/quit_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -1,14 +1,6 @@
 {
-	"quit",
-	"Exit the console",
+	"exit",
+	"Exit the shell",
 	&cmd_quit,
 	&help_cmd_quit,
-	-1
 },
-{
-	"exit",
-	NULL,
-	&cmd_quit,
-	&help_cmd_quit,
-	-1
-},
Index: uspace/app/bdsh/cmds/modules/rm/rm_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/rm/rm_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,13 +4,4 @@
 	&cmd_rm,
 	&help_cmd_rm,
-	0
 },
 
-{
-	"del",
-	NULL,
-	&cmd_rm,
-	&help_cmd_rm,
-	0
-},
-
Index: uspace/app/bdsh/cmds/modules/sleep/sleep_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,5 +4,4 @@
 	&cmd_sleep,
 	&help_cmd_sleep,
-	0
 },
 
Index: uspace/app/bdsh/cmds/modules/touch/touch_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch_def.h	(revision 890793bb6b874641ead0bdd471465d6453f7fb10)
+++ uspace/app/bdsh/cmds/modules/touch/touch_def.h	(revision 491af0758837101e936eb4ead9f4b1ab22a80ead)
@@ -4,5 +4,4 @@
 	&cmd_touch,
 	&help_cmd_touch,
-	0
 },