diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
index f6f6d194f3..be73ce6c71 100755
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
@@ -133,20 +133,6 @@
-
-
-
-
-
-
-
-
SortOptionsDialog.xaml
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/RunIncrementalSearch.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/RunIncrementalSearch.cs
deleted file mode 100644
index 837d24b0f4..0000000000
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/RunIncrementalSearch.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Windows.Documents;
-using ICSharpCode.AvalonEdit.Editing;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Editor;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.AvalonEdit.AddIn.Commands
-{
- public class RunIncrementalSearch : AbstractMenuCommand
- {
- public override void Run()
- {
- ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
- if (provider != null) {
- TextArea textArea = provider.TextEditor.GetService(typeof(TextArea)) as TextArea;
- if (textArea != null) {
- textArea.ActiveInputHandler = new IncrementalSearch(textArea, LogicalDirection.Forward);
- }
- }
- }
- }
-
- public class RunReverseIncrementalSearch : AbstractMenuCommand
- {
- public override void Run()
- {
- ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
- if (provider != null) {
- TextArea textArea = provider.TextEditor.GetService(typeof(TextArea)) as TextArea;
- if (textArea != null) {
- textArea.ActiveInputHandler = new IncrementalSearch(textArea, LogicalDirection.Backward);
- }
- }
- }
- }
-}
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 102252206b..1a72b0cd2e 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1624,7 +1624,6 @@