diff --git a/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.cpp b/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.cpp
index d5da774863..ef74e91302 100644
--- a/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.cpp
+++ b/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.cpp
@@ -113,7 +113,6 @@ void RiaPlotWindowRedrawScheduler::performScheduledUpdates()
             }
         }
 
-        // TODO - add method to viewer interface to get dock container size
         if ( auto pdmView = plotBook->ownerViewWindow() )
         {
             QSize s = pdmView->dockWidget()->size();
diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.h b/ApplicationLibCode/ProjectDataModel/Rim3dView.h
index 92256eda9e..d40be63b1e 100644
--- a/ApplicationLibCode/ProjectDataModel/Rim3dView.h
+++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.h
@@ -71,11 +71,6 @@ namespace caf
 class DisplayCoordTransform;
 }
 
-namespace ads
-{
-class CDockWidget;
-}
-
 enum PartRenderMaskEnum
 {
     surfaceBit               = 1,
diff --git a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
index 514950512b..4b56f56509 100644
--- a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
@@ -110,13 +110,6 @@ RiuMainWindowBase* RimDockWindowController::getMainWindow()
     return nullptr;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimDockWindowController::setupBeforeSave()
-{
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.h b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.h
index 06ebf934b7..e742e3d146 100644
--- a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.h
+++ b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.h
@@ -60,9 +60,6 @@ protected:
     QWidget*           viewWidget();
     RiuMainWindowBase* getMainWindow();
 
-    // Overridden PDM methods
-    void setupBeforeSave() override;
-
 private:
     caf::PdmField<int>               m_mainWindowID;
     caf::PdmPtrField<RimViewWindow*> m_viewToControl;
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
index 72624aaaa6..bb70916832 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
@@ -2833,10 +2833,6 @@ void RimSummaryPlot::onPlotItemSelected( std::shared_ptr<RiuPlotItem> plotItem,
 
     auto rimPlotCurve = riuPlotCurve->ownerRimCurve();
 
-    // if ( auto multiPlot = firstAncestorOrThisOfType<RimMultiPlot>() )
-    //{
-    //     RiuPlotMainWindowTools::setActiveViewer( multiPlot->dockWindowName() );
-    // }
     RiuPlotMainWindowTools::selectOrToggleObject( rimPlotCurve, toggle );
 }
 
diff --git a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
index b203b7fd6a..6b621117b5 100644
--- a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
+++ b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
@@ -64,9 +64,9 @@ QString RiuDockWidgetTools::main3DWindowName()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::welcomeScreenName()
+QString RiuDockWidgetTools::centralScreenName()
 {
-    return "dockWelcomeScreen";
+    return "dockCentralScreen";
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h
index e8493964ec..7b63aa819b 100644
--- a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h
+++ b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h
@@ -52,7 +52,7 @@ public:
     static QString mainPlotWindowName();
     static QString main3DWindowName();
 
-    static QString welcomeScreenName();
+    static QString centralScreenName();
 
     static QString mainWindowPropertyEditorName();
     static QString mainWindowResultInfoName();
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp
index 0d023169b3..c792ce8eff 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp
@@ -2050,14 +2050,6 @@ QStringList RiuMainWindow::defaultDockStateNames()
     return retList;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-QStringList RiuMainWindow::windowsMenuFeatureNames()
-{
-    return {};
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindow.h b/ApplicationLibCode/UserInterface/RiuMainWindow.h
index 8d02f6d4b7..2d0ffd81d6 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindow.h
+++ b/ApplicationLibCode/UserInterface/RiuMainWindow.h
@@ -128,7 +128,6 @@ public:
 protected:
     void        closeEvent( QCloseEvent* event ) override;
     QStringList defaultDockStateNames() override;
-    QStringList windowsMenuFeatureNames() override;
 
     void dragEnterEvent( QDragEnterEvent* event ) override;
     void dropEvent( QDropEvent* event ) override;
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
index ceef1b5ee5..84cf0b72b9 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
@@ -493,11 +493,11 @@ void RiuMainWindowBase::createTreeViews( int numberOfTrees )
 //--------------------------------------------------------------------------------------------------
 void RiuMainWindowBase::setUpCentralDockWidget()
 {
-    m_centralDockWidget = RiuDockWidgetTools::createDockWidget( "Welcome", RiuDockWidgetTools::welcomeScreenName(), this );
-    QLabel* welcome     = new QLabel();
-    welcome->setAutoFillBackground( true );
-    welcome->setStyleSheet( "QLabel { background-color: darkgrey; }" );
-    m_centralDockWidget->setWidget( welcome );
+    m_centralDockWidget = RiuDockWidgetTools::createDockWidget( "", RiuDockWidgetTools::centralScreenName(), this );
+    QLabel* label       = new QLabel();
+    label->setAutoFillBackground( true );
+    label->setStyleSheet( "QLabel { background-color: darkgrey; }" );
+    m_centralDockWidget->setWidget( label );
     m_centralDockWidget->setFeature( ads::CDockWidget::NoTab, true );
     dockManager()->setCentralWidget( m_centralDockWidget );
 }
@@ -702,7 +702,7 @@ void RiuMainWindowBase::addDefaultEntriesToWindowsMenu()
     keys.sort();
     for ( auto& key : keys )
     {
-        if ( key == RiuDockWidgetTools::welcomeScreenName() ) continue;
+        if ( key == RiuDockWidgetTools::centralScreenName() ) continue;
         auto dock = dockMap[key];
         dockWindowsMenu->addAction( dock->toggleViewAction() );
     }
@@ -742,14 +742,6 @@ void RiuMainWindowBase::addDefaultEntriesToWindowsMenu()
         QAction* exportLayoutAction = m_windowMenu->addAction( "Export Layout to Clipboard" );
         connect( exportLayoutAction, SIGNAL( triggered() ), this, SLOT( exportDockLayout() ) );
     }
-
-    caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
-
-    auto featureNames = windowsMenuFeatureNames();
-    for ( const auto& name : featureNames )
-    {
-        m_windowMenu->addAction( cmdFeatureMgr->action( name ) );
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.h b/ApplicationLibCode/UserInterface/RiuMainWindowBase.h
index c1ecd8a5ce..831360c0d9 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.h
+++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.h
@@ -112,8 +112,6 @@ protected:
 
     virtual QStringList defaultDockStateNames() = 0;
 
-    virtual QStringList windowsMenuFeatureNames() = 0;
-
     void showEvent( QShowEvent* event ) override;
 
 protected slots:
diff --git a/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp b/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp
index 53c9209e56..0ccb073da1 100644
--- a/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp
@@ -452,8 +452,6 @@ void RiuMultiPlotBook::applyPagePreviewBookSize( int frameWidth )
 //--------------------------------------------------------------------------------------------------
 void RiuMultiPlotBook::applyBookSize( int frameWidth, int frameHeight )
 {
-    qDebug() << "Size " << frameWidth << " x " << frameHeight << "\n";
-    if ( frameWidth == 54 ) return;
     int totalHeight = 0;
     for ( auto page : m_pages )
     {
diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
index 24d1d1aeb7..f4ed1e5d47 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
+++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
@@ -979,14 +979,6 @@ QStringList RiuPlotMainWindow::defaultDockStateNames()
     return retList;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-QStringList RiuPlotMainWindow::windowsMenuFeatureNames()
-{
-    return {};
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
index 115de52160..2d21071f53 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
+++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
@@ -93,7 +93,6 @@ protected:
     void timerEvent( QTimerEvent* event ) override;
 
     QStringList defaultDockStateNames() override;
-    QStringList windowsMenuFeatureNames() override;
 
 private:
     void setPdmRoot( caf::PdmObject* pdmRoot );
diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp b/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
index 0eb5029ef2..cd3d83fa09 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
+++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
@@ -40,9 +40,10 @@ void RiuPlotMainWindowTools::setActiveViewer( QString viewerName )
 {
     if ( RiaGuiApplication::isRunning() )
     {
-        RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
-
-        if ( mpw ) mpw->setActiveViewer( viewerName );
+        if ( auto mpw = RiaGuiApplication::instance()->mainPlotWindow() )
+        {
+            mpw->setActiveViewer( viewerName );
+        }
     }
 }
 
@@ -53,10 +54,10 @@ void RiuPlotMainWindowTools::setExpanded( const caf::PdmUiItem* uiItem )
 {
     if ( RiaGuiApplication::isRunning() )
     {
-        RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
-
-        bool expand = true;
-        if ( mpw ) mpw->setExpanded( uiItem, expand );
+        if ( auto mpw = RiaGuiApplication::instance()->mainPlotWindow() )
+        {
+            mpw->setExpanded( uiItem, true );
+        }
     }
 }
 
@@ -67,10 +68,10 @@ void RiuPlotMainWindowTools::selectAsCurrentItem( const caf::PdmObject* object )
 {
     if ( RiaGuiApplication::isRunning() )
     {
-        RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
-
-        bool allowActiveViewChange = true;
-        if ( mpw ) mpw->selectAsCurrentItem( object, allowActiveViewChange );
+        if ( auto mpw = RiaGuiApplication::instance()->mainPlotWindow() )
+        {
+            mpw->selectAsCurrentItem( object, true /* allowActiveViewChange */ );
+        }
     }
 }
 
@@ -81,17 +82,18 @@ const caf::PdmObject* RiuPlotMainWindowTools::firstVisibleAncestorOrThis( const
 {
     if ( RiaGuiApplication::isRunning() )
     {
-        RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
-
-        auto current = const_cast<caf::PdmObject*>( object );
-        while ( current )
+        if ( auto mpw = RiaGuiApplication::instance()->mainPlotWindow() )
         {
-            if ( mpw->getTreeViewWithItem( current ) )
+            auto current = const_cast<caf::PdmObject*>( object );
+            while ( current )
             {
-                return current;
-            }
+                if ( mpw->getTreeViewWithItem( current ) )
+                {
+                    return current;
+                }
 
-            current = current->firstAncestorOfType<caf::PdmObject>();
+                current = current->firstAncestorOfType<caf::PdmObject>();
+            }
         }
     }
 
@@ -105,10 +107,10 @@ void RiuPlotMainWindowTools::toggleItemInSelection( const caf::PdmObject* object
 {
     if ( RiaGuiApplication::isRunning() )
     {
-        RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
-
-        bool allowActiveViewChange = true;
-        if ( mpw ) mpw->toggleItemInSelection( object, allowActiveViewChange );
+        if ( auto mpw = RiaGuiApplication::instance()->mainPlotWindow() )
+        {
+            mpw->toggleItemInSelection( object, true /* allowActiveViewChange */ );
+        }
     }
 }
 
@@ -134,9 +136,7 @@ void RiuPlotMainWindowTools::refreshToolbars()
 {
     if ( RiaGuiApplication::isRunning() )
     {
-        RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
-
-        if ( mpw )
+        if ( auto mpw = RiaGuiApplication::instance()->mainPlotWindow() )
         {
             mpw->updateWellLogPlotToolBar();
             mpw->updateMultiPlotToolBar();
diff --git a/ApplicationLibCode/UserInterface/RiuViewer.cpp b/ApplicationLibCode/UserInterface/RiuViewer.cpp
index 0f4ea7b9ff..a4597d4f88 100644
--- a/ApplicationLibCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationLibCode/UserInterface/RiuViewer.cpp
@@ -723,8 +723,6 @@ void RiuViewer::mousePressEvent( QMouseEvent* mouseEvent )
     if ( mouseEvent )
     {
         m_lastMousePressPosition = mouseEvent->pos();
-
-        if ( auto ownView = ownerViewWindow() ) ownView->setAsActiveViewer();
     }
 }