Index: Core/Common/src/Core.Common.Controls.Charting/ChartView.cs
===================================================================
diff -u -r3bfa4dc5fb5ea3560752479de86cb843419f8fe3 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Controls.Charting/ChartView.cs	(.../ChartView.cs)	(revision 3bfa4dc5fb5ea3560752479de86cb843419f8fe3)
+++ Core/Common/src/Core.Common.Controls.Charting/ChartView.cs	(.../ChartView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -250,10 +250,6 @@
             }
         }
 
-        [Browsable(false)]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public ViewInfo ViewInfo { get; set; }
-
         /// <summary>
         /// Gives the range of the bottom axis (assuming the axis is a of type DateTime)
         /// </summary>
Index: Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -37,7 +37,5 @@
         }
 
         public override string Text { get; set; }
-
-        public ViewInfo ViewInfo { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs
===================================================================
diff -u -rfa33f7c078c5d17f92f6a519f147a0a371593944 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision fa33f7c078c5d17f92f6a519f147a0a371593944)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -1259,8 +1259,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         #endregion
 
         #region Public functions
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs
===================================================================
diff -u -r25019cc752a91361f32968c26d48064ed35a916c -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision 25019cc752a91361f32968c26d48064ed35a916c)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -181,10 +181,6 @@
             }
         }
 
-        [Browsable(false)]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public ViewInfo ViewInfo { get; set; }
-
         public bool CanDelete(ITreeNode node)
         {
             return controller.CanDeleteNode(node);
Index: Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -36,8 +36,6 @@
 
         public virtual object Data { get; set; }
 
-        public ViewInfo ViewInfo { get; set; }
-
         public IEnumerable<IComponent> Pages
         {
             get
Index: Core/Common/src/Core.Common.Controls/Views/IView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -16,7 +16,5 @@
         /// Gets or sets the *caption/title* for the view
         /// </summary>
         string Text { get; set; }
-
-        ViewInfo ViewInfo { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -71,8 +71,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         public static Image GetImageForSeverity(bool isCategory, ValidationSeverity severity)
         {
             switch (severity)
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.Designer.cs
===================================================================
diff -u -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.Designer.cs	(.../ValidationView.Designer.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.Designer.cs	(.../ValidationView.Designer.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -70,7 +70,6 @@
             this.validationReportControl.Data = null;
             resources.ApplyResources(this.validationReportControl, "validationReportControl");
             this.validationReportControl.Name = "validationReportControl";
-            this.validationReportControl.ViewInfo = null;
             // 
             // ValidationView
             // 
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs
===================================================================
diff -u -r1edd0ab99383de32bd499b82d258a04cf9bda260 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 1edd0ab99383de32bd499b82d258a04cf9bda260)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -54,8 +54,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         private bool RefreshReport()
         {
             if (Data == null || OnValidate == null)
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -263,8 +263,6 @@
             set {}
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         #endregion
 
         #region IMessageWindow Members
Index: Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs	(.../PropertyGridView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs	(.../PropertyGridView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -129,8 +129,6 @@
             return gui != null ? gui.PropertyResolver.GetObjectProperties(sourceData) : null;
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         #endregion
 
         #region Tab key navigation
Index: Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -36,8 +36,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         #endregion
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs
===================================================================
diff -u -r60284d242516286b70997e1894fa22b67d7f10ab -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs	(.../AvalonDockDockingManagerTest.cs)	(revision 60284d242516286b70997e1894fa22b67d7f10ab)
+++ Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs	(.../AvalonDockDockingManagerTest.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -18,10 +18,7 @@
         {
             var mocks = new MockRepository();
             var dockManager = mocks.Stub<DockingManager>();
-            var view = new TestView
-            {
-                ViewInfo = new ViewInfo()
-            };
+            var view = new TestView();
 
             var dock = new AvalonDockDockingManager(dockManager, new[]
             {
@@ -40,14 +37,8 @@
         [Test]
         public void SwitchingTabCausesOldTabsActiveControlToLoseFocusTools9109()
         {
-            var view = new TestView
-            {
-                ViewInfo = new ViewInfo()
-            };
-            var view2 = new TestView
-            {
-                ViewInfo = new ViewInfo()
-            };
+            var view = new TestView();
+            var view2 = new TestView();
 
             // create an avalon dock/tab with two views
             var dock = new AvalonDockDockingManager(new DockingManager(), new[]
Index: Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -21,8 +21,6 @@
 
         public object Data { get; set; }
 
-        public ViewInfo ViewInfo { get; set; }
-
         #endregion
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Test/TestObjects/TestView.cs
===================================================================
diff -u -r60284d242516286b70997e1894fa22b67d7f10ab -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 60284d242516286b70997e1894fa22b67d7f10ab)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -12,8 +12,6 @@
         }
 
         public object Data { get; set; }
-
-        public ViewInfo ViewInfo { get; set; }
     }
 
     public class TestViewDerivative : TestView
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs
===================================================================
diff -u -r3bfa4dc5fb5ea3560752479de86cb843419f8fe3 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 3bfa4dc5fb5ea3560752479de86cb843419f8fe3)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -48,8 +48,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         private void TreeViewSelectedNodeChanged(object sender, EventArgs e)
         {
             if (guiPlugin == null || guiPlugin.Gui == null)
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -56,8 +56,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         public new void Dispose()
         {
             ProjectTreeView.Data = null;
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs
===================================================================
diff -u -r25019cc752a91361f32968c26d48064ed35a916c -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 25019cc752a91361f32968c26d48064ed35a916c)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -109,8 +109,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-        
         public new void Dispose()
         {
             if (gui != null)
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs
===================================================================
diff -u -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -91,8 +91,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         public ContextMenuStrip GetContextMenu(object nodeTag)
         {
             if (nodeTag is Layer)
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -rfa33f7c078c5d17f92f6a519f147a0a371593944 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision fa33f7c078c5d17f92f6a519f147a0a371593944)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -287,8 +287,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         /// <summary>
         /// Expects a Map
         /// </summary>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs
===================================================================
diff -u -rfa33f7c078c5d17f92f6a519f147a0a371593944 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision fa33f7c078c5d17f92f6a519f147a0a371593944)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -127,8 +127,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         public ILayer Layer { set; get; }
 
         /// <summary>
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs	(.../MapViewTabControlTest.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs	(.../MapViewTabControlTest.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -172,7 +172,6 @@
             public event EventHandler OnDeactivatedCalled;
             public object Data { get; set; }
 
-            public ViewInfo ViewInfo { get; set; }
             public IEnumerable<IFeature> SelectedFeatures { get; set; }
             public ILayer Layer { set; get; }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 71dede5dbf330ad9b3f552c5bfd09f7b09b3e14c)
@@ -40,8 +40,6 @@
             }
         }
 
-        public ViewInfo ViewInfo { get; set; }
-
         public void UpdateObserver()
         {
             SetNormText();