diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index b4ac3ed070..7d56122673 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -76,7 +76,6 @@
     <Compile Include="Src\Completion\OverrideEqualsGetHashCodeCompletionData.cs" />
     <Compile Include="Src\Completion\OverrideToStringCompletionData.cs" />
     <Compile Include="Src\Completion\SegmentTrackingOutputFormatter.cs" />
-    <Compile Include="Src\CSharpTextEditorExtension.cs" />
     <Compile Include="Src\FormattingStrategy\CSharpFormatter.cs" />
     <Compile Include="Src\Parser\FoldingVisitor.cs" />
     <Compile Include="Src\Refactoring\AbstractInlineRefactorDialog.cs" />
@@ -99,7 +98,6 @@
     <Compile Include="Src\Refactoring\MoveTypeToFileContextAction.cs" />
     <Compile Include="Src\Refactoring\Options.cs" />
     <Compile Include="Src\Refactoring\RefactoringExtensions.cs" />
-    <Compile Include="Src\Refactoring\RenameContextAction.cs" />
     <Compile Include="Src\Refactoring\OverrideEqualsGetHashCodeMethodsDialog.xaml.cs">
       <DependentUpon>OverrideEqualsGetHashCodeMethodsDialog.xaml</DependentUpon>
     </Compile>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs
index 0d0554b5d2..3747f73235 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs
@@ -43,12 +43,13 @@ namespace CSharpBinding
 		ITextEditor editor;
 		IssueManager inspectionManager;
 		IList<IContextActionProvider> contextActionProviders;
+		CodeManipulation codeManipulation;
 		
 		public void Attach(ITextEditor editor)
 		{
 			this.editor = editor;
 			inspectionManager = new IssueManager(editor);
-			//codeManipulation = new CodeManipulation(editor);
+			codeManipulation = new CodeManipulation(editor);
 			
 			if (!editor.ContextActionProviders.IsReadOnly) {
 				contextActionProviders = AddInTree.BuildItems<IContextActionProvider>("/SharpDevelop/ViewContent/TextEditor/C#/ContextActions", null);
@@ -58,7 +59,7 @@ namespace CSharpBinding
 		
 		public void Detach()
 		{
-			//codeManipulation.Dispose();
+			codeManipulation.Dispose();
 			if (inspectionManager != null) {
 				inspectionManager.Dispose();
 				inspectionManager = null;