Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -ra805f816afeba48586bf812cd9869ad215b5d9c2
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision a805f816afeba48586bf812cd9869ad215b5d9c2)
@@ -403,11 +403,6 @@
                 childViewSubscribtionLookup.Remove(view);
             }
 
-            if (Gui != null && Gui.Plugins != null)
-            {
-                Gui.Plugins.ForEach(p => p.OnViewRemoved(view));
-            }
-
             // remove from docking manager
             dockingManager.Remove(view, removeTabFromDockingManager);
 
Index: Core/Common/src/Core.Common.Gui/GuiPlugin.cs
===================================================================
diff -u -r73335def039bb6d77b199f621d941bb7d15f786d -ra805f816afeba48586bf812cd9869ad215b5d9c2
--- Core/Common/src/Core.Common.Gui/GuiPlugin.cs	(.../GuiPlugin.cs)	(revision 73335def039bb6d77b199f621d941bb7d15f786d)
+++ Core/Common/src/Core.Common.Gui/GuiPlugin.cs	(.../GuiPlugin.cs)	(revision a805f816afeba48586bf812cd9869ad215b5d9c2)
@@ -81,8 +81,6 @@
             Gui = null;
         }
 
-        public virtual void OnViewRemoved(IView view) { }
-
         public virtual void OnActiveViewChanged(IView view) { }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs
===================================================================
diff -u -rda41c27c4bf84199e199322cce445e490aacff08 -ra805f816afeba48586bf812cd9869ad215b5d9c2
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision da41c27c4bf84199e199322cce445e490aacff08)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision a805f816afeba48586bf812cd9869ad215b5d9c2)
@@ -173,21 +173,6 @@
             gisGuiService = null;
         }
 
-        public override void OnViewRemoved(IView view)
-        {
-            UpdateMapLegendView();
-
-            var mapView = GetFocusedMapView(view);
-            if (mapView == null)
-            {
-                return;
-            }
-
-            mapView.MapControl.SelectedFeaturesChanged -= MapControlSelectedFeaturesChanged;
-            mapView.MapControl.MouseDoubleClick -= mapView_MouseDoubleClick;
-            mapView.Map.MapRendered -= MapMapRendered;
-        }
-
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
             return SharpMapGisPropertyInfoProvider.GetPropertyInfos();
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/SharpMapGisApplicationPlugin.cs
===================================================================
diff -u -r73335def039bb6d77b199f621d941bb7d15f786d -ra805f816afeba48586bf812cd9869ad215b5d9c2
--- Core/Plugins/src/Core.Plugins.SharpMapGis/SharpMapGisApplicationPlugin.cs	(.../SharpMapGisApplicationPlugin.cs)	(revision 73335def039bb6d77b199f621d941bb7d15f786d)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/SharpMapGisApplicationPlugin.cs	(.../SharpMapGisApplicationPlugin.cs)	(revision a805f816afeba48586bf812cd9869ad215b5d9c2)
@@ -14,16 +14,16 @@
 
         public override IEnumerable<DataItemInfo> GetDataItemInfos()
         {
-            yield return new DataItemInfo<Map>
-            {
-                Name = "Map",
-                Category = "General",
-                Image = Properties.Resources.Map,
-                CreateData = owner => new Map
-                {
-                    Name = "Map"
-                }
-            };
+//            yield return new DataItemInfo<Map>
+//            {
+//                Name = "Map",
+//                Category = "General",
+//                Image = Properties.Resources.Map,
+//                CreateData = owner => new Map
+//                {
+//                    Name = "Map"
+//                }
+//            };
 
             yield break;
         }