Index: src/Common/DelftTools.Controls.Swf/Charting/ChartView.cs
===================================================================
diff -u -r341078d82fcf9051b233068ad0172940aa71cff5 -r910cccc26d73c3fe1828c6f1f10e44fbe8fa130a
--- src/Common/DelftTools.Controls.Swf/Charting/ChartView.cs	(.../ChartView.cs)	(revision 341078d82fcf9051b233068ad0172940aa71cff5)
+++ src/Common/DelftTools.Controls.Swf/Charting/ChartView.cs	(.../ChartView.cs)	(revision 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a)
@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Linq;
 using System.Windows.Forms;
 using DelftTools.Controls.Swf.Charting.Customized;
@@ -13,8 +12,6 @@
 using Steema.TeeChart;
 using Steema.TeeChart.Drawing;
 using Steema.TeeChart.Tools;
-using RectangleTool = DelftTools.Controls.Swf.Charting.Tools.RectangleTool;
-using SeriesBandTool = DelftTools.Controls.Swf.Charting.Tools.SeriesBandTool;
 
 namespace DelftTools.Controls.Swf.Charting
 {
@@ -675,131 +672,8 @@
 
         #region TeeChart Factory Methods
 
-        public ICursorLineTool NewCursorLineTool(CursorLineToolStyles lineToolStyle)
+        public EditPointTool NewEditPointTool()
         {
-            return NewCursorLineTool(lineToolStyle, Color.DarkRed, 2, DashStyle.Dash);
-        }
-
-        public ICursorLineTool NewCursorLineTool(CursorLineToolStyles lineToolStyle, Color lineColor, int lineWidth, DashStyle lineDashStyle)
-        {
-            var style = CursorToolStyles.Horizontal;
-
-            if (lineToolStyle == CursorLineToolStyles.Vertical)
-            {
-                style = CursorToolStyles.Vertical;
-            }
-
-            if (lineToolStyle == CursorLineToolStyles.Both)
-            {
-                style = CursorToolStyles.Both;
-            }
-
-            var tool = new CursorLineTool(teeChart, style, lineColor, lineWidth, lineDashStyle)
-            {
-                Chart = teeChart.Chart,
-                ChartView = this
-            };
-            Tools.Add(tool);
-            return tool;
-        }
-
-        public SeriesBandTool NewSeriesBandTool(IChartSeries series1, IChartSeries series2, Color color)
-        {
-            return NewSeriesBandTool(series1, series2, color, null);
-        }
-
-        public SeriesBandTool NewSeriesBandTool(IChartSeries series1, IChartSeries series2, Color color, HatchStyle? hatchStyle)
-        {
-            return NewSeriesBandTool(series1, series2, color, hatchStyle, Color.Black);
-        }
-
-        public SeriesBandTool NewSeriesBandTool(IChartSeries series1, IChartSeries series2, Color color, HatchStyle? hatchStyle, Color hatchStyleForegroundColor)
-        {
-            var tool = new SeriesBandTool
-            {
-                Chart = teeChart.Chart,
-                ChartView = this,
-                Series = series1,
-                Series2 = series2,
-                Brush =
-                {
-                    Color = color
-                }
-            };
-
-            if (hatchStyle != null)
-            {
-                tool.Brush.Solid = false;
-                tool.Brush.Style = (HatchStyle) hatchStyle;
-                tool.Brush.ForegroundColor = hatchStyleForegroundColor;
-            }
-
-            return tool;
-        }
-
-        public IRectangleTool NewRectangleTool()
-        {
-            var tool = new RectangleTool(teeChart.Chart)
-            {
-                AutoSize = false,
-                Height = 50,
-                Left = 10,
-                Shape =
-                {
-                    Bottom = 60,
-                    Brush =
-                    {
-                        Color = Color.FromArgb(64, 255, 255, 255)
-                    },
-                    CustomPosition = true,
-                    ImageTransparent = true,
-                    Left = 10,
-                    Right = 60,
-                    Shadow =
-                    {
-                        Brush =
-                        {
-                            Color = Color.FromArgb(64, 169, 169, 169)
-                        }
-                    },
-                    Top = 10
-                },
-                Top = 10,
-                Width = 50,
-                ChartView = this
-            };
-
-            Tools.Add(tool);
-            return tool;
-        }
-
-        public IImageTool NewImageTool(Image image)
-        {
-            var tool = new ImageTool(teeChart)
-            {
-                ChartView = this,
-                Image = image,
-                Top = 20,
-                Left = 20,
-                Width = 20,
-                Height = 20
-            };
-            Tools.Add(tool);
-            return tool;
-        }
-
-        public HistoryTool NewHistoryTool()
-        {
-            var tool = new HistoryTool(teeChart)
-            {
-                ChartView = this
-            };
-            Tools.Add(tool);
-            return tool;
-        }
-
-        public IEditPointTool NewEditPointTool()
-        {
             var tool = new EditPointTool(teeChart)
             {
                 ChartView = this
@@ -818,7 +692,7 @@
             return tool;
         }
 
-        public IRulerTool NewRulerTool()
+        public RulerTool NewRulerTool()
         {
             var tool = new RulerTool(teeChart)
             {
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/CursorLineTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Common/DelftTools.Controls.Swf/Charting/Tools/EditPointTool.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r910cccc26d73c3fe1828c6f1f10e44fbe8fa130a
--- src/Common/DelftTools.Controls.Swf/Charting/Tools/EditPointTool.cs	(.../EditPointTool.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Controls.Swf/Charting/Tools/EditPointTool.cs	(.../EditPointTool.cs)	(revision 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a)
@@ -14,7 +14,7 @@
     /// <summary>
     /// Tools for moving and deleting points (responds to 'DEL'button)
     /// </summary>
-    public class EditPointTool : ChartViewSeriesToolBase, IEditPointTool
+    public class EditPointTool : ChartViewSeriesToolBase
     {
         public event EventHandler<PointEventArgs> BeforeDrag;
 
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/HistoryTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/ICursorLineTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/IEditPointTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/IImageTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/IMarkerTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/IRectangleTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/IRulerTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/ImageTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/MarkerTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/RectangleTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Common/DelftTools.Controls.Swf/Charting/Tools/RulerTool.cs
===================================================================
diff -u -r841d3efd31f92b5fb792bbd99c153dfeb0627458 -r910cccc26d73c3fe1828c6f1f10e44fbe8fa130a
--- src/Common/DelftTools.Controls.Swf/Charting/Tools/RulerTool.cs	(.../RulerTool.cs)	(revision 841d3efd31f92b5fb792bbd99c153dfeb0627458)
+++ src/Common/DelftTools.Controls.Swf/Charting/Tools/RulerTool.cs	(.../RulerTool.cs)	(revision 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a)
@@ -10,7 +10,7 @@
 
 namespace DelftTools.Controls.Swf.Charting.Tools
 {
-    public class RulerTool : IRulerTool
+    public class RulerTool : IChartViewTool
     {
         private static readonly ILog Log = LogManager.GetLogger(typeof(RulerTool));
         private readonly DeltaShellTChart teeChart;
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Charting/Tools/SeriesBandTool.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Common/DelftTools.Controls.Swf/DelftTools.Controls.Swf.csproj
===================================================================
diff -u -r7ed651cfe3a60d98c0b05e5a76adfed65c49b7d6 -r910cccc26d73c3fe1828c6f1f10e44fbe8fa130a
--- src/Common/DelftTools.Controls.Swf/DelftTools.Controls.Swf.csproj	(.../DelftTools.Controls.Swf.csproj)	(revision 7ed651cfe3a60d98c0b05e5a76adfed65c49b7d6)
+++ src/Common/DelftTools.Controls.Swf/DelftTools.Controls.Swf.csproj	(.../DelftTools.Controls.Swf.csproj)	(revision 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a)
@@ -133,12 +133,6 @@
     </Compile>
     <Compile Include="Charting\Tools\ChartMouseEvent.cs" />
     <Compile Include="Charting\Tools\ExportChartAsImageChartTool.cs" />
-    <Compile Include="Charting\Tools\IEditPointTool.cs" />
-    <Compile Include="Charting\Tools\IImageTool.cs" />
-    <Compile Include="Charting\Tools\ImageTool.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Charting\Tools\IRulerTool.cs" />
     <Compile Include="Charting\Tools\RulerTool.cs" />
     <Compile Include="Charting\Tools\ToolBase.cs" />
     <Compile Include="Charting\Tools\ToolWrapper.cs">
@@ -181,28 +175,10 @@
     <Compile Include="Charting\Tools\AddPointTool.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Charting\Tools\SeriesBandTool.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Charting\Tools\CursorLineTool.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="Charting\Tools\EditPointTool.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Charting\Tools\HistoryTool.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Charting\Tools\ICursorLineTool.cs" />
-    <Compile Include="Charting\Tools\IMarkerTool.cs" />
-    <Compile Include="Charting\Tools\IRectangleTool.cs" />
-    <Compile Include="Charting\Tools\MarkerTool.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="Charting\Tools\PointEventArgs.cs" />
-    <Compile Include="Charting\Tools\RectangleTool.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="Charting\Tools\SelectPointTool.cs">
       <SubType>Component</SubType>
     </Compile>
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/Charting/Tools/CursorLineToolTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/Charting/Tools/HistoryToolTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/Common/DelftTools.Tests/DelftTools.Tests.csproj
===================================================================
diff -u -r2ff69dfc67c77d80c1ed2f4f1f9bc0172e28e518 -r910cccc26d73c3fe1828c6f1f10e44fbe8fa130a
--- test/Common/DelftTools.Tests/DelftTools.Tests.csproj	(.../DelftTools.Tests.csproj)	(revision 2ff69dfc67c77d80c1ed2f4f1f9bc0172e28e518)
+++ test/Common/DelftTools.Tests/DelftTools.Tests.csproj	(.../DelftTools.Tests.csproj)	(revision 910cccc26d73c3fe1828c6f1f10e44fbe8fa130a)
@@ -39,14 +39,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-	<WarningLevel>4</WarningLevel>
+    <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\Release\</OutputPath>
-	<WarningLevel>4</WarningLevel>
+    <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DefineConstants>TRACE</DefineConstants>
@@ -105,8 +105,6 @@
     <Compile Include="Controls\Swf\Charting\Series\PointChartSeriesTest.cs" />
     <Compile Include="Controls\Swf\Charting\Series\PolygonChartSeriesTest.cs" />
     <Compile Include="Controls\Swf\Charting\Series\TeeChartSeriesDecoratorTest.cs" />
-    <Compile Include="Controls\Swf\Charting\Tools\CursorLineToolTest.cs" />
-    <Compile Include="Controls\Swf\Charting\Tools\HistoryToolTest.cs" />
     <Compile Include="Controls\Swf\Charting\YearViewDateTimeFormatProviderTest.cs" />
     <Compile Include="Controls\Swf\CSV\CsvImportTest.cs" />
     <Compile Include="Controls\Swf\CustomInputDialogTest.cs" />