Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r3162879857e27b830d6f24982828d2e811aa2f2d -r043516e6ae215ccc09fdfd7d8193a8885a143bf7
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 3162879857e27b830d6f24982828d2e811aa2f2d)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 043516e6ae215ccc09fdfd7d8193a8885a143bf7)
@@ -219,7 +219,6 @@
     </Compile>
     <Compile Include="Forms\ViewHost\IViewHost.cs" />
     <Compile Include="Forms\ViewHost\DocumentViewController.cs" />
-    <Compile Include="Properties\Settings.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <DependentUpon>Settings.settings</DependentUpon>
       <AutoGen>True</AutoGen>
@@ -342,6 +341,7 @@
     <None Include="Properties\Settings.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </None>
     <Resource Include="Resources\application_import_blue.ico" />
     <Resource Include="Resources\application_import_blue.png" />
Index: Core/Common/src/Core.Common.Gui/GuiCore.cs
===================================================================
diff -u -r15112fbb75ed51e38efb261b0608b82eee220f25 -r043516e6ae215ccc09fdfd7d8193a8885a143bf7
--- Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision 15112fbb75ed51e38efb261b0608b82eee220f25)
+++ Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision 043516e6ae215ccc09fdfd7d8193a8885a143bf7)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Configuration;
 using System.Diagnostics;
@@ -45,7 +44,6 @@
 using Core.Common.Gui.Selection;
 using Core.Common.Gui.Settings;
 using Core.Common.Utils.Extensions;
-using Core.Common.Utils.Reflection;
 using log4net;
 using log4net.Appender;
 using log4net.Repository.Hierarchy;
@@ -182,8 +180,6 @@
 
             isExiting = true;
 
-            CopyDefaultViewsToUserSettings();
-
             if (userSettingsDirty)
             {
                 UserSettings.Save();
@@ -415,8 +411,6 @@
             InitializeWindows();
 
             InitializePlugins();
-
-            CopyDefaultViewsFromUserSettings();
         }
 
         private void ShowSplashScreen()
@@ -543,44 +537,6 @@
             }
         }
 
-        private void CopyDefaultViewsFromUserSettings()
-        {
-            if (UserSettings["defaultViews"] == null)
-            {
-                return;
-            }
-
-            var defaultViews = (StringCollection) UserSettings["defaultViews"];
-            var defaultViewDataTypes = (StringCollection) UserSettings["defaultViewDataTypes"];
-
-            for (int i = 0; i < defaultViews.Count; i++)
-            {
-                string viewDataTypeName = defaultViewDataTypes[i];
-                string viewTypeName = defaultViews[i];
-
-                Type viewDataType = AssemblyUtils.GetTypeByName(viewDataTypeName);
-                if (viewDataType != null)
-                {
-                    DocumentViewController.DefaultViewTypes.Add(viewDataType, AssemblyUtils.GetTypeByName(viewTypeName));
-                }
-            }
-        }
-
-        private void CopyDefaultViewsToUserSettings()
-        {
-            StringCollection defaultViews = new StringCollection();
-            StringCollection defaultViewDataTypes = new StringCollection();
-
-            foreach (Type objectType in DocumentViewController.DefaultViewTypes.Keys.Where(objectType => DocumentViewController.DefaultViewTypes[objectType] != null))
-            {
-                defaultViews.Add(DocumentViewController.DefaultViewTypes[objectType].ToString());
-                defaultViewDataTypes.Add(objectType.ToString());
-            }
-
-            UserSettings["defaultViews"] = defaultViews;
-            UserSettings["defaultViewDataTypes"] = defaultViewDataTypes;
-        }
-
         ~GuiCore()
         {
             Dispose(false);
Index: Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs
===================================================================
diff -u -r15112fbb75ed51e38efb261b0608b82eee220f25 -r043516e6ae215ccc09fdfd7d8193a8885a143bf7
--- Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs	(.../Settings.Designer.cs)	(revision 15112fbb75ed51e38efb261b0608b82eee220f25)
+++ Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs	(.../Settings.Designer.cs)	(revision 043516e6ae215ccc09fdfd7d8193a8885a143bf7)
@@ -25,28 +25,6 @@
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public global::System.Collections.Specialized.StringCollection defaultViewDataTypes {
-            get {
-                return ((global::System.Collections.Specialized.StringCollection)(this["defaultViewDataTypes"]));
-            }
-            set {
-                this["defaultViewDataTypes"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public global::System.Collections.Specialized.StringCollection defaultViews {
-            get {
-                return ((global::System.Collections.Specialized.StringCollection)(this["defaultViews"]));
-            }
-            set {
-                this["defaultViews"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
         public bool showSplashScreen {
             get {
Fisheye: Tag 043516e6ae215ccc09fdfd7d8193a8885a143bf7 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Properties/Settings.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/Properties/Settings.settings
===================================================================
diff -u -r15112fbb75ed51e38efb261b0608b82eee220f25 -r043516e6ae215ccc09fdfd7d8193a8885a143bf7
--- Core/Common/src/Core.Common.Gui/Properties/Settings.settings	(.../Settings.settings)	(revision 15112fbb75ed51e38efb261b0608b82eee220f25)
+++ Core/Common/src/Core.Common.Gui/Properties/Settings.settings	(.../Settings.settings)	(revision 043516e6ae215ccc09fdfd7d8193a8885a143bf7)
@@ -2,12 +2,6 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Core.Common.Gui.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="defaultViewDataTypes" Type="System.Collections.Specialized.StringCollection" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="defaultViews" Type="System.Collections.Specialized.StringCollection" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="showSplashScreen" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
Index: Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -r15112fbb75ed51e38efb261b0608b82eee220f25 -r043516e6ae215ccc09fdfd7d8193a8885a143bf7
--- Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision 15112fbb75ed51e38efb261b0608b82eee220f25)
+++ Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision 043516e6ae215ccc09fdfd7d8193a8885a143bf7)
@@ -1044,13 +1044,9 @@
         private static void AssertDefaultUserSettings(SettingsBase settings)
         {
             Assert.IsNotNull(settings);
-            Assert.AreEqual(3, settings.Properties.Count);
+            Assert.AreEqual(1, settings.Properties.Count);
 
             // Note: Cannot assert particular values, as they can be changed by user.
-            var defaultViewDataTypes = (StringCollection) settings["defaultViewDataTypes"];
-            Assert.IsNotNull(defaultViewDataTypes);
-            var defaultViews = (StringCollection) settings["defaultViews"];
-            Assert.IsNotNull(defaultViews);
             var showSplashScreen = (bool) settings["showSplashScreen"];
             Assert.IsNotNull(showSplashScreen);
         }