Index: Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs
===================================================================
diff -u -r232c52a296ea93557d8ee2e85a857b1010d3fad4 -raea7dbbb03aac9b1b2d76a49e666c472b4d6f60c
--- Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision 232c52a296ea93557d8ee2e85a857b1010d3fad4)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision aea7dbbb03aac9b1b2d76a49e666c472b4d6f60c)
@@ -23,23 +23,13 @@
 using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using System.Windows.Forms.VisualStyles;
 
 namespace Core.Common.Controls.TreeView
 {
     public class TreeView : System.Windows.Forms.TreeView
     {
         public TreeView()
         {
-            StateImageList = new ImageList();
-
-            StateImageList.Images.Add(CreateCheckBoxGlyph(CheckBoxState.UncheckedNormal));
-            StateImageList.Images.Add(CreateCheckBoxGlyph(CheckBoxState.CheckedNormal));
-
-            DrawMode = TreeViewDrawMode.Normal;
-            LabelEdit = true;
-            HideSelection = false;
-
             // Enable default double buffering processing
             SetStyle(ControlStyles.OptimizedDoubleBuffer | ControlStyles.AllPaintingInWmPaint, true);
 
@@ -50,18 +40,6 @@
             }
         }
 
-        private Image CreateCheckBoxGlyph(CheckBoxState state)
-        {
-            Bitmap result = new Bitmap(16, 16);
-            using (Graphics g = Graphics.FromImage(result))
-            {
-                Size glyphSize = CheckBoxRenderer.GetGlyphSize(g, state);
-                CheckBoxRenderer.DrawCheckBox(g,
-                  new Point((result.Width - glyphSize.Width) / 2, (result.Height - glyphSize.Height) / 2), state);
-            }
-            return result;
-        }
-
         # region Logic for preventing expand/collapse on double click
 
         protected override void DefWndProc(ref Message m)