diff --git a/src/mgcp/mgcp_vty.c b/src/mgcp/mgcp_vty.c
index dfcc6fe..85c70c5 100644
--- a/src/mgcp/mgcp_vty.c
+++ b/src/mgcp/mgcp_vty.c
@@ -858,7 +858,6 @@
 	install_element(CONFIG_NODE, &cfg_mgcp_cmd);
 	install_node(&mgcp_node, config_write_mgcp);
 
-	install_default(MGCP_NODE);
 	install_element(MGCP_NODE, &ournode_exit_cmd);
 	install_element(MGCP_NODE, &ournode_end_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_local_ip_cmd);
@@ -883,7 +882,6 @@
 
 	install_element(MGCP_NODE, &cfg_mgcp_vtrunk_cmd);
 	install_node(&vtrunk_node, config_write_vtrunk);
-	install_default(VTRUNK_NODE);
 	install_element(VTRUNK_NODE, &ournode_exit_cmd);
 	install_element(VTRUNK_NODE, &ournode_end_cmd);
 	install_element(VTRUNK_NODE, &cfg_vtrunk_number_endp_cmd);
@@ -897,7 +895,6 @@
 
 	install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd);
 	install_node(&trunk_node, config_write_trunk);
-	install_default(TRUNK_NODE);
 	install_element(TRUNK_NODE, &ournode_exit_cmd);
 	install_element(TRUNK_NODE, &ournode_end_cmd);
 	install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd);
diff --git a/src/vty_interface.c b/src/vty_interface.c
index 3a654c0..ab90897 100644
--- a/src/vty_interface.c
+++ b/src/vty_interface.c
@@ -77,31 +77,6 @@
 	return vty->node;
 }
 
-
-DEFUN(node_exit, node_exit_cmd,
-      "exit", "Exit the current node\n")
-{
-	ss7_go_parent(vty);
-	return CMD_SUCCESS;
-}
-
-DEFUN(node_end, node_end_cmd,
-      "end", "End the current mode and change to the enable node\n")
-{
-	switch (vty->node) {
-	case VIEW_NODE:
-	case ENABLE_NODE:
-		break;
-	default:
-		vty_config_unlock(vty);
-		vty->node = ENABLE_NODE;
-		vty->index = NULL;
-		vty->index_sub = NULL;
-		break;
-	}
-	return CMD_SUCCESS;
-}
-
 static struct vty_app_info vty_info = {
 	.name 		= "OsmoSTP",
 	.version	= VERSION,
@@ -1316,9 +1291,6 @@
 
 static void install_defaults(int node)
 {
-	install_default(node);
-	install_element(node, &node_exit_cmd);
-	install_element(node, &node_end_cmd);
 	install_element(node, &cfg_description_cmd);
 	install_element(node, &cfg_no_description_cmd);
 }