diff --git a/src/LyXAction.C b/src/LyXAction.C
index b03658c038..b035494ff3 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -264,7 +264,6 @@ void LyXAction::init()
 		{ LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly },
 		{ LFUN_SCREEN_UP, "screen-up", ReadOnly | NoUpdate},
 		{ LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly },
-		{ LFUN_INSET_SCROLL, "inset-scroll", ReadOnly },
 		{ LFUN_SELF_INSERT, "self-insert", SingleParUpdate },
 		{ LFUN_SPACE_INSERT, "space-insert", Noop },
 		{ LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly },
@@ -323,7 +322,6 @@ void LyXAction::init()
 		{ LFUN_ALL_CHANGES_REJECT, "all-changes-reject", Noop },
 		{ LFUN_DIALOG_SHOW, "dialog-show", NoBuffer },
 		{ LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", Noop },
-		{ LFUN_DIALOG_SHOW_NEXT_INSET, "dialog-show-next-inset", Noop },
 		{ LFUN_DIALOG_UPDATE, "dialog-update", NoBuffer },
 		{ LFUN_DIALOG_HIDE, "dialog-hide", Noop },
 		{ LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset", Noop },
diff --git a/src/lfuns.h b/src/lfuns.h
index 8c0b79608b..2d988ce27c 100644
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -269,104 +269,102 @@ enum kb_action {
 	LFUN_TABULAR_FEATURE,           // Jug 20000728
 	LFUN_LAYOUT_TABULAR,            // Jug 20000731
 	// 200
-	LFUN_INSET_SCROLL,              // Jug 20000801
 	LFUN_BUFFER_UPDATE,                    // Dekel 20000805
 	LFUN_INDEX_INSERT,              // Angus 20000803
 	LFUN_SCREEN_FONT_UPDATE,        // ARRae 20000813
 	LFUN_PARAGRAPH_GOTO,            // Dekel 20000826
-	// 205
 	LFUN_REFERENCE_NEXT,            // Dekel 20010114
+	// 205
 	LFUN_BOOKMARK_SAVE,             // Dekel 20010127
 	LFUN_BOOKMARK_GOTO,             // Dekel 20010127
 	LFUN_SELECT_FILE_SYNC,          // Levon 20010214
 	LFUN_MESSAGE,                   // Lgb 20010408
-	// 210
 	LFUN_CHARS_TRANSPOSE,           // Lgb 20010425
+	// 210
 	LFUN_ESCAPE,                    // Lgb 20010517
 	LFUN_THESAURUS_ENTRY,           // Levon 20010720
 	LFUN_TOOLTIPS_TOGGLE,           // Angus 8 Mar 2002
 	LFUN_OPTIONAL_INSERT,              // Martin 12 Aug 2002
-	// 215
 	LFUN_MOUSE_PRESS,               // André 9 Aug 2002
+	// 215
 	LFUN_MOUSE_MOTION,              // André 9 Aug 2002
 	LFUN_MOUSE_RELEASE,             // André 9 Aug 2002
 	LFUN_MOUSE_DOUBLE,              // André 9 Aug 2002
 	LFUN_MOUSE_TRIPLE,              // André 9 Aug 2002
-	// 220
 	LFUN_WRAP_INSERT,                // Dekel 7 Apr 2002
+	// 220
 	LFUN_CHANGES_TRACK,             // Levon 20021001 (cool date !)
 	LFUN_CHANGES_MERGE,             // Levon 20021016
 	LFUN_CHANGE_ACCEPT,             // Levon 20021016
 	LFUN_CHANGE_REJECT,             // Levon 20021016
-	// 225
 	LFUN_ALL_CHANGES_ACCEPT,        // Levon 20021016
+	// 225
 	LFUN_ALL_CHANGES_REJECT,        // Levon 20021016
 	LFUN_BIBITEM_INSERT,            // André 14 Feb 2003
 	LFUN_DIALOG_SHOW,
 	LFUN_DIALOG_SHOW_NEW_INSET,
-	// 230
-	LFUN_DIALOG_SHOW_NEXT_INSET,
 	LFUN_DIALOG_UPDATE,
+	// 230
 	LFUN_DIALOG_HIDE,
 	LFUN_DIALOG_DISCONNECT_INSET,
 	LFUN_INSET_APPLY,
-	// 235
 	LFUN_INSET_INSERT,
 	LFUN_INSET_MODIFY,
+	// 235
 	LFUN_INSET_DIALOG_UPDATE,
 	LFUN_INSET_SETTINGS,
 	LFUN_PARAGRAPH_PARAMS_APPLY,
-	// 240
 	LFUN_PARAGRAPH_UPDATE,
 	LFUN_EXTERNAL_EDIT,
+	// 240
 	LFUN_BRANCH_INSERT,
 	LFUN_BOX_INSERT,
 	LFUN_LINE_INSERT,
-	// 245
 	LFUN_PAGEBREAK_INSERT,
 	LFUN_REPEAT,
+	// 245
 	LFUN_FINISHED_LEFT,
 	LFUN_FINISHED_RIGHT,
 	LFUN_FINISHED_UP,
-	// 250
 	LFUN_FINISHED_DOWN,
 	LFUN_CHARSTYLE_INSERT,
+	// 250
 	LFUN_WORD_FIND,
 	LFUN_WORD_REPLACE,
 	LFUN_BUFFER_EXPORT_CUSTOM,
-	// 255
 	LFUN_BUFFER_PRINT,
 	LFUN_NEXT_INSET_TOGGLE,
+	// 255
 	LFUN_ALL_INSETS_TOGGLE,
 	LFUN_BUFFER_LANGUAGE,
 	LFUN_TEXTCLASS_APPLY,
-	// 260
 	LFUN_TEXTCLASS_LOAD,
 	LFUN_BUFFER_SAVE_AS_DEFAULT,
+	// 260
 	LFUN_BUFFER_PARAMS_APPLY,
 	LFUN_LYXRC_APPLY,
 	LFUN_GRAPHICS_EDIT,
-	// 265
 	LFUN_INSET_REFRESH,
 	LFUN_BUFFER_NEXT,
+	// 265
 	LFUN_BUFFER_PREVIOUS,
 	LFUN_WORDS_COUNT,
 	LFUN_CHANGES_OUTPUT,             // jspitzm 20050121
-	// 270
 	LFUN_BIBTEX_DATABASE_ADD,
 	LFUN_BIBTEX_DATABASE_DEL,
+	// 270
 	LFUN_CITATION_INSERT,
 	LFUN_OUTLINE_UP,                 // Vermeer 20060323
 	LFUN_OUTLINE_DOWN,
-	// 275
 	LFUN_OUTLINE_IN,
 	LFUN_OUTLINE_OUT,
+	// 275
 	LFUN_PARAGRAPH_MOVE_DOWN,                // Edwin 20060408
 	LFUN_PARAGRAPH_MOVE_UP,                  // Edwin 20060408
 	LFUN_BUFFER_TOGGLE_COMPRESSION,                 // bpeng 20060427
-	// 280
 	LFUN_MATH_BIGDELIM,
 	LFUN_CLIPBOARD_PASTE,
+	// 280
 	LFUN_INSET_DISSOLVE,                 // jspitzm 20060807
 
 	LFUN_LASTACTION                  // end of the table
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index e1b4dd4708..a5c12c42ed 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -589,7 +589,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	case LFUN_SERVER_GET_NAME:
 	case LFUN_SERVER_NOTIFY:
 	case LFUN_SERVER_GOTO_FILE_ROW:
-	case LFUN_DIALOG_SHOW_NEXT_INSET:
 	case LFUN_DIALOG_HIDE:
 	case LFUN_DIALOG_DISCONNECT_INSET:
 	case LFUN_BUFFER_CHILD_OPEN:
@@ -1235,9 +1234,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			break;
 		}
 
-		case LFUN_DIALOG_SHOW_NEXT_INSET:
-			break;
-
 		case LFUN_DIALOG_UPDATE: {
 			string const & name = argument;
 			// Can only update a dialog connected to an existing inset