diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp
index 11865a3293..918d446ba5 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp
@@ -50,8 +50,8 @@ void RicSummaryCurveCalculatorDialog::setUp()
     QVBoxLayout* mainLayout = new QVBoxLayout(this);
     mainLayout->setContentsMargins(0, 0, 0, 0);
 
-    m_summaryCalcWidget = std::unique_ptr<RicSummaryCurveCalculatorEditor>(new RicSummaryCurveCalculatorEditor(this));
-    mainLayout->addWidget(m_summaryCalcWidget->getOrCreateWidget(this));
+    m_summaryCalcEditor = std::unique_ptr<RicSummaryCurveCalculatorEditor>(new RicSummaryCurveCalculatorEditor());
+    mainLayout->addWidget(m_summaryCalcEditor->getOrCreateWidget(this));
 
     QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
@@ -59,6 +59,6 @@ void RicSummaryCurveCalculatorDialog::setUp()
 
     mainLayout->addWidget(buttonBox);
     
-    m_summaryCalcWidget->updateUi();
+    m_summaryCalcEditor->updateUi();
 }
 
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h
index ff3e8d8a6e..fd0c56e9ff 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h
@@ -37,5 +37,5 @@ private:
     void setUp();
 
 private:
-    std::unique_ptr<RicSummaryCurveCalculatorEditor> m_summaryCalcWidget;
+    std::unique_ptr<RicSummaryCurveCalculatorEditor> m_summaryCalcEditor;
 };
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
index 15c661f93e..4163ed9647 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
@@ -19,19 +19,13 @@
 #include "RicSummaryCurveCalculatorEditor.h"
 
 #include "RicSummaryCurveCalculator.h"
-
-#include "RiaApplication.h"
-#include "RimCalculationCollection.h"
 #include "RimCalculation.h"
-#include "RimProject.h"
 
 #include "cafPdmUiTableView.h"
 
 #include "QMinimizePanel.h"
 
-#include <QAbstractItemView>
 #include <QBoxLayout>
-#include <QFrame>
 #include <QHeaderView>
 #include <QSplitter>
 #include <QTableView>
@@ -40,22 +34,11 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor(QWidget* parent)
+RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor()
 {
     m_calculator = std::unique_ptr<RicSummaryCurveCalculator>(new RicSummaryCurveCalculator);
 
     this->setPdmObject(m_calculator.get());
-
-    m_pdmTableView = new caf::PdmUiTableView(parent);
-    m_pdmTableView->tableView()->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    m_pdmTableView->enableHeaderText(false);
-
-    RimProject* proj = RiaApplication::instance()->project();
-
-    QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader();
-    verticalHeader->setResizeMode(QHeaderView::Interactive);
-
-    m_pdmTableView->tableView()->resizeColumnsToContents();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -116,6 +99,15 @@ void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiIte
 //--------------------------------------------------------------------------------------------------
 QWidget* RicSummaryCurveCalculatorEditor::createWidget(QWidget* parent)
 {
+    m_pdmTableView = new caf::PdmUiTableView(parent);
+    m_pdmTableView->tableView()->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    m_pdmTableView->enableHeaderText(false);
+
+    QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader();
+    verticalHeader->setResizeMode(QHeaderView::Interactive);
+
+    m_pdmTableView->tableView()->resizeColumnsToContents();
+
     QWidget* widget = new QWidget(parent);
 
     QVBoxLayout* mainLayout = new QVBoxLayout();
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h
index f1b32886b6..a0516faaf1 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h
@@ -26,11 +26,9 @@
 class RicSummaryCurveCalculator;
 
 class QMinimizePanel;
-class QSplitter;
 class QString;
 class QVBoxLayout;
 class QHBoxLayout;
-class QBoxLayout;
 
 namespace caf {
     class PdmUiItem;
@@ -45,7 +43,7 @@ namespace caf {
 class RicSummaryCurveCalculatorEditor : public caf::PdmUiWidgetBasedObjectEditor
 {
 public:
-    RicSummaryCurveCalculatorEditor(QWidget* parent);
+    RicSummaryCurveCalculatorEditor();
     ~RicSummaryCurveCalculatorEditor();
 
 private: