diff --git a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin
index 2fb9517402..078c0f11c6 100644
--- a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin
+++ b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin
@@ -18,9 +18,6 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/BackendBindings/ProjectOptions/AllManaged">
-		<OptionPanel id          = "SourceAnalysis"
-		             label       = "${res:AddIns.SourceAnalysis.Title}"
-		             class       = "ICSharpCode.SourceAnalysis.old_AnalysisProjectOptionsPanel"/>
 		<OptionPanel id          = "SourceAnalysis"
 		             label       = "${res:AddIns.SourceAnalysis.Title}"
 		             class       = "ICSharpCode.SourceAnalysis.AnalysisProjectOptionsPanel"/>
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
index e6f73fc45e..28c21e505e 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
@@ -5,9 +5,14 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
 	xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
-	xmlns:projects="clr-namespace:ICSharpCode.SharpDevelop.Project"
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
+
+	<optionpanels:ProjectOptionPanel.Resources>
+		<local:StringToBoolConverter x:Key="strToBool"></local:StringToBoolConverter>
+	</optionpanels:ProjectOptionPanel.Resources>
+	
 	<ScrollViewer VerticalScrollBarVisibility="Auto">
+		
 		<StackPanel
 			Orientation="Vertical">
 			<GroupBox
@@ -65,7 +70,7 @@
 						VerticalAlignment="Center"
 						IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
 						Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}"
-						IsChecked="{Binding DelaySign.Value,Converter={StaticResource strTobool}}">
+						IsChecked="{Binding DelaySign.Value,Converter={StaticResource strToBool}}">
 					</CheckBox>
 					
 					<Label
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs
index ad0283afd1..aa2a0357a0 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs
@@ -6,21 +6,13 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
-using System.Text;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
+
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Project;
-using ICSharpCode.SharpDevelop.Widgets;
 
 namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 {