Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r0d8098264ea05ccbf529b3c2c54479fdbc0ef670 -r1edd0ab99383de32bd499b82d258a04cf9bda260
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 0d8098264ea05ccbf529b3c2c54479fdbc0ef670)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 1edd0ab99383de32bd499b82d258a04cf9bda260)
@@ -90,7 +90,6 @@
     <Compile Include="Dialogs\ExceptionDialog.Designer.cs">
       <DependentUpon>ExceptionDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\IAdditionalView.cs" />
     <Compile Include="Views\IReusableView.cs" />
     <Compile Include="Views\IView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Fisheye: Tag 1edd0ab99383de32bd499b82d258a04cf9bda260 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Views/IAdditionalView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r1edd0ab99383de32bd499b82d258a04cf9bda260
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 1edd0ab99383de32bd499b82d258a04cf9bda260)
@@ -8,7 +8,7 @@
 
 namespace Core.Common.Gui.Swf.Validation
 {
-    public partial class ValidationView : UserControl, IAdditionalView
+    public partial class ValidationView : UserControl, IView
     {
         private readonly Stopwatch stopwatch = new Stopwatch();
         private Func<object, ValidationReport> onValidate;
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs
===================================================================
diff -u -rfefc0cc505a41a79d4643c80335484daf4ca30ce -r1edd0ab99383de32bd499b82d258a04cf9bda260
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision fefc0cc505a41a79d4643c80335484daf4ca30ce)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 1edd0ab99383de32bd499b82d258a04cf9bda260)
@@ -68,14 +68,6 @@
                         return CreateViewFromViewInfo(data, viewInfoList[0]);
                     }
 
-                    var principalViewInfoList =
-                        viewInfoList.Where(vi => !vi.ViewType.Implements<IAdditionalView>()).ToList();
-
-                    if (principalViewInfoList.Count == 1)
-                    {
-                        return CreateViewFromViewInfo(data, principalViewInfoList[0]);
-                    }
-
                     // Create default view
                     var defaultType = GetDefaultViewType(data);
                     var defaultViewInfo = viewInfoList.FirstOrDefault(vi => vi.ViewType == defaultType);
@@ -134,7 +126,7 @@
 
         public IList<IView> GetViewsForData(object data)
         {
-            return GetViewsForData(viewList.Where(v => !(v is IAdditionalView)), data).ToList();
+            return GetViewsForData(viewList, data).ToList();
         }
 
         public void CloseAllViewsFor(object data)
Index: Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r1edd0ab99383de32bd499b82d258a04cf9bda260
--- Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 1edd0ab99383de32bd499b82d258a04cf9bda260)
@@ -66,26 +66,6 @@
         }
 
         [Test]
-        public void OpenViewForDataWithTwoViewsOneAdditionalViewShouldNotCausePrompt()
-        {
-            // for example if we have a central map view & a validation view for a model, the choice is simple!
-            var viewList = new ViewList(new TestDockingManager(), ViewLocation.Left);
-            var viewResolver = new ViewResolver(viewList, new ViewInfo[]
-            {
-                new ViewInfo<object, TestView>(),
-                new ViewInfo<object, AdditionalView>()
-            }, null);
-
-            var testObject = new object();
-
-            viewResolver.OpenViewForData(testObject);
-
-            var viewForTestObject = (TestView) viewList[0];
-            Assert.IsInstanceOf<TestView>(viewForTestObject);
-            Assert.AreEqual(testObject, viewForTestObject.Data);
-        }
-
-        [Test]
         public void OpenViewForDataWithViewTypeShouldUseNewViews()
         {
             // for example if we have a open functionview. Opening a view for another function should use the existing functionview
Index: Core/Common/test/Core.Common.Test/TestObjects/TestView.cs
===================================================================
diff -u -r28e7cc0bd810e74ac836f2de5e61497e94c693dd -r1edd0ab99383de32bd499b82d258a04cf9bda260
--- Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 28e7cc0bd810e74ac836f2de5e61497e94c693dd)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 1edd0ab99383de32bd499b82d258a04cf9bda260)
@@ -42,8 +42,6 @@
         }
     }
 
-    public class AdditionalView : TestView, IAdditionalView {}
-
     public class TestWrapper
     {
         public string RealData { get; set; }