diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHidePane.cs b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHidePane.cs
index 1566585131..3d2212745b 100644
--- a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHidePane.cs
+++ b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHidePane.cs
@@ -24,12 +24,6 @@ namespace WeifenLuo.WinFormsUI
 			m_tabs = new AutoHideTabCollection(DockPane);
 		}
 
-		/// <exclude/>
-		~AutoHidePane()
-		{
-			Dispose(false);
-		}
-
 		/// <include file='CodeDoc/AutoHidePane.xml' path='//CodeDoc/Class[@name="AutoHidePane"]/Property[@name="DockPane"]/*'/>
 		public DockPane DockPane
 		{
@@ -45,14 +39,10 @@ namespace WeifenLuo.WinFormsUI
 
 		/// <include file='CodeDoc/AutoHidePane.xml' path='//CodeDoc/Class[@name="AutoHidePane"]/Method[@name="Dispose"]/*'/>
 		/// <include file='CodeDoc/AutoHidePane.xml' path='//CodeDoc/Class[@name="AutoHidePane"]/Method[@name="Dispose()"]/*'/>
-		public void Dispose()
-		{
-			Dispose(true);
-		}
-
-		/// <include file='CodeDoc/AutoHidePane.xml' path='//CodeDoc/Class[@name="AutoHidePane"]/Method[@name="Dispose(bool)"]/*'/>
-		protected virtual void Dispose(bool disposing)
+		public virtual void Dispose()
 		{
+			// we don't need to dispose anything here, but we want to allow deriving classes
+			// to override dispose
 		}
 	}
 }
diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs
index 2955fb1502..29eec17a6e 100644
--- a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs
+++ b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs
@@ -200,8 +200,7 @@ namespace WeifenLuo.WinFormsUI
 
 			// requires further tracking of mouse hover behavior,
 			// call TrackMouseEvent
-			Win32.TRACKMOUSEEVENTS tme = new Win32.TRACKMOUSEEVENTS(Win32.TRACKMOUSEEVENTS.TME_HOVER, Handle, Win32.TRACKMOUSEEVENTS.HOVER_DEFAULT);
-			User32.TrackMouseEvent(ref tme);
+			this.ResetMouseEventArgs();
 		}
 
 		/// <exclude />
diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideTab.cs b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideTab.cs
index 1db6e50205..95c6394dbf 100644
--- a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideTab.cs
+++ b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideTab.cs
@@ -23,12 +23,6 @@ namespace WeifenLuo.WinFormsUI
 			m_content = content;
 		}
 
-		/// <exclude/>
-		~AutoHideTab()
-		{
-			Dispose(false);
-		}
-
 		/// <include file='CodeDoc/AutoHideTab.xml' path='//CodeDoc/Class[@name="AutoHideTab"]/Property[@name="Content"]/*'/>
 		public DockContent Content
 		{
@@ -37,14 +31,10 @@ namespace WeifenLuo.WinFormsUI
 
 		/// <include file='CodeDoc/AutoHideTab.xml' path='//CodeDoc/Class[@name="AutoHideTab"]/Method[@name="Dispose"]/*'/>
 		/// <include file='CodeDoc/AutoHideTab.xml' path='//CodeDoc/Class[@name="AutoHideTab"]/Method[@name="Dispose()"]/*'/>
-		public void Dispose()
-		{
-			Dispose(true);
-		}
-
-		/// <include file='CodeDoc/AutoHideTab.xml' path='//CodeDoc/Class[@name="AutoHideTab"]/Method[@name="Dispose(bool)"]/*'/>
-		protected virtual void Dispose(bool disposing)
+		public virtual void Dispose()
 		{
+			// we don't need to dispose anything here, but we want to allow deriving classes
+			// to override dispose
 		}
 	}
 }