Index: src/Common/DelftTools.Controls.Swf/TreeViewControls/TreeView.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rd8e4bf47a1ff5b13a9d9e6eaf60b9ca9cd7c7555
--- src/Common/DelftTools.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision d8e4bf47a1ff5b13a9d9e6eaf60b9ca9cd7c7555)
@@ -29,7 +29,7 @@
         private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private readonly TreeNodeList nodes;
 
-        internal bool isUpdateSuspended;
+        private bool isUpdateSuspended;
         private TreeViewController controller;
         private int dropAtLocation;
         private Point lastDragOverPoint;
@@ -200,16 +200,6 @@
             return controller.CanRenameNode(SelectedNode);
         }
 
-        public void EnableDataEventListeners()
-        {
-            controller.EnableDataEventListeners();
-        }
-
-        public void DisableDataEventListeners()
-        {
-            controller.DisableDataEventListeners();
-        }
-
         public new void CollapseAll()
         {
             foreach (var node in Nodes)
@@ -442,15 +432,6 @@
             controller.OnTreeViewHandleCreated();
         }
 
-        protected override void OnHandleDestroyed(EventArgs e)
-        {
-            if (controller != null)
-            {
-                controller.OnTreeViewHandleDestroyed();
-            }
-            base.OnHandleDestroyed(e);
-        }
-
         /// <summary>
         /// Custom drawing.
         /// </summary>
@@ -473,8 +454,6 @@
         {
             if (disposing && controller != null)
             {
-                controller.OnTreeViewHandleDestroyed();
-                controller.Dispose();
                 controller = null;
             }
 
@@ -789,10 +768,8 @@
 
             if (node.IsOnCheckBox(point))
             {
-                DisableDataEventListeners();
                 node.Checked = !node.Checked;
-                EnableDataEventListeners();
-            }
+             }
 
             if (node.IsOnExpandButton(point))
             {