diff --git a/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.cpp b/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.cpp
index 4ed5f1794eab8bd68c1c8624a8c1db9a806c8531..98f2d491a7a2f2383c629b407c5ecddb7373f0cb 100644
--- a/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.cpp
+++ b/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.cpp
@@ -7,7 +7,6 @@
 #include "MDFEditLocalParameterDialog.h"
 #include "MDFLocalParameterItemDelegate.h"
 #include "MantidKernel/make_unique.h"
-#include "MultiDatasetFit.h"
 
 #include <QClipboard>
 #include <QMenu>
@@ -25,34 +24,7 @@ namespace CustomInterfaces {
 namespace MDF {
 
 /**
- * Constructor when used as part of MultiDatasetFit interface
- * @param multifit :: [input] Pointer to parent MultiDatasetFit interface
- * @param parName :: [input] Name of parameter to edit in this dialog
- */
-EditLocalParameterDialog::EditLocalParameterDialog(MultiDatasetFit *multifit,
-                                                   const QString &parName)
-    : QDialog(multifit), m_parName(parName) {
-  m_uiForm.setupUi(this);
-  const int n = multifit->getNumberOfSpectra();
-  QStringList wsNames;
-  std::vector<size_t> wsIndices;
-
-  for (int i = 0; i < n; ++i) {
-    double value = multifit->getLocalParameterValue(parName, i);
-    m_values.push_back(value);
-    bool fixed = multifit->isLocalParameterFixed(parName, i);
-    m_fixes.push_back(fixed);
-    auto tie = multifit->getLocalParameterTie(parName, i);
-    m_ties.push_back(tie);
-    wsNames.append(multifit->getWorkspaceName(i));
-    wsIndices.push_back(multifit->getWorkspaceIndex(i));
-  }
-
-  doSetup(parName, wsNames, wsIndices);
-}
-
-/**
- * Constructor when used outside of MultiDatasetFit interface
+ * Constructor used inside and outside of MultiDatasetFit interface
  * @param parent :: [input] Parent widget of this dialog
  * @param funcBrowser :: [input] Function browser this is working with
  * @param parName :: [input] Name of parameter to edit in this dialog
@@ -361,9 +333,6 @@ void EditLocalParameterDialog::setValueToLog(int i) {
   } catch (const std::invalid_argument &err) {
     const auto &message =
         QString("Failed to get log value:\n\n %1").arg(err.what());
-    if (const auto *multifit = static_cast<MultiDatasetFit *>(this->parent())) {
-      multifit->logWarning(message.toStdString());
-    }
     QMessageBox::critical(this, "MantidPlot - Error", message);
   }
   m_values[i] = value;
diff --git a/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.h b/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.h
index 39baf96b2b88747c281ba4dd5fb0257a5a96aa24..2eb8551c9ece66f6e0abf8eab40eb14e782259c3 100644
--- a/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.h
+++ b/qt/scientific_interfaces/MultiDatasetFit/MDFEditLocalParameterDialog.h
@@ -16,8 +16,6 @@
 namespace MantidQt {
 namespace CustomInterfaces {
 
-class MultiDatasetFit;
-
 namespace MDF {
 
 /**
@@ -28,7 +26,6 @@ namespace MDF {
 class MANTIDQT_MULTIDATASETFIT_DLL EditLocalParameterDialog : public QDialog {
   Q_OBJECT
 public:
-  EditLocalParameterDialog(MultiDatasetFit *parent, const QString &parName);
   EditLocalParameterDialog(QWidget *parent,
                            MantidWidgets::IFunctionBrowser *funcBrowser,
                            const QString &parName, const QStringList &wsNames,
diff --git a/qt/scientific_interfaces/MultiDatasetFit/MultiDatasetFit.cpp b/qt/scientific_interfaces/MultiDatasetFit/MultiDatasetFit.cpp
index 22c47f0caff09a2d969885082c341033811726ca..52c1d1139f1433715eedbc75e3bebed958c7a6ec 100644
--- a/qt/scientific_interfaces/MultiDatasetFit/MultiDatasetFit.cpp
+++ b/qt/scientific_interfaces/MultiDatasetFit/MultiDatasetFit.cpp
@@ -458,7 +458,15 @@ int MultiDatasetFit::getNumberOfSpectra() const {
 /// @param parName :: Fully qualified name for a local parameter (Global
 /// unchecked).
 void MultiDatasetFit::editLocalParameterValues(const QString &parName) {
-  MDF::EditLocalParameterDialog dialog(this, parName);
+  QStringList wsNames;
+  std::vector<size_t> wsIndices;
+  const int n = getNumberOfSpectra();
+  for (int i = 0; i < n; ++i) {
+    wsNames.append(getWorkspaceName(i));
+    wsIndices.push_back(getWorkspaceIndex(i));
+  }
+
+  MDF::EditLocalParameterDialog dialog(this, m_functionBrowser, parName, wsNames, wsIndices);
   if (dialog.exec() == QDialog::Accepted) {
     auto values = dialog.getValues();
     auto fixes = dialog.getFixes();
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h
index c084931363d4ded3b7b4a5534a49bb1bab00c845..8a169026942542aa95195e79036e6c372c131933 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h
@@ -7,8 +7,6 @@
 #ifndef INDIRECTFITPROPERTYBROWSER_H_
 #define INDIRECTFITPROPERTYBROWSER_H_
 
-//#include "MantidQtWidgets/Common/FitPropertyBrowser.h"
-//#include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidAPI/IFunction_fwd.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
diff --git a/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp b/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp
index 59cbd1f4b499fc5f7b874a6a995d79717a170565..e0dcb4c624a464ddb4961cd16d6cf8487d4c563d 100644
--- a/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp
+++ b/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp
@@ -7,29 +7,8 @@
 #include "MantidQtWidgets/Common/IndirectFitPropertyBrowser.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/WorkspaceGroup.h"
-//#include "MantidQtWidgets/Common/PropertyHandler.h"
-//#include "MantidQtWidgets/Common/QtPropertyBrowser/StringEditorFactory.h"
 #include "MantidQtWidgets/Common/SignalBlocker.h"
 
-// Suppress a warning coming out of code that isn't ours
-//#if defined(__INTEL_COMPILER)
-//#pragma warning disable 1125
-//#elif defined(__GNUC__)
-//#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
-//#pragma GCC diagnostic push
-//#endif
-//#pragma GCC diagnostic ignored "-Woverloaded-virtual"
-//#endif
-//#include "MantidQtWidgets/Common/QtPropertyBrowser/DoubleEditorFactory.h"
-//#include "MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h"
-//#if defined(__INTEL_COMPILER)
-//#pragma warning enable 1125
-//#elif defined(__GNUC__)
-//#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
-//#pragma GCC diagnostic pop
-//#endif
-//#endif
-
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/CompositeFunction.h"
 #include "MantidAPI/FrameworkManager.h"