diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 2a91e574169be0537c1f86483bfcc7339971e05e..8d3d8ccc651de7b34af19ee8d2e58e540386d01e 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -26,7 +26,6 @@
#include <boost/python/implicit.hpp>
#include <boost/python/overloads.hpp>
#include <boost/python/register_ptr_to_python.hpp>
-#include <boost/python/suite/indexing/map_indexing_suite.hpp>
#define PY_ARRAY_UNIQUE_SYMBOL API_ARRAY_API
#define NO_IMPORT_ARRAY
diff --git a/qt/python/mantidqt/widgets/matrixworkspacedisplay/__main__.py b/qt/python/mantidqt/widgets/matrixworkspacedisplay/__main__.py
index 96a6352a2fca6eae9ca3cb2f19366df962f0af79..bbc4a33811a2e8b14a48b1754455a6db858f9ccc 100644
--- a/qt/python/mantidqt/widgets/matrixworkspacedisplay/__main__.py
+++ b/qt/python/mantidqt/widgets/matrixworkspacedisplay/__main__.py
@@ -8,35 +8,19 @@
#
#
-# To Run target this package with PyCharm, and __main__ will be executed
+# To Run - target this package with PyCharm, and __main__ will be executed
import os
+import matplotlib
+matplotlib.use('Qt5Agg')
+import matplotlib.pyplot as plt
from qtpy.QtWidgets import QApplication
from mantid.simpleapi import Load
from mantidqt.widgets.matrixworkspacedisplay.presenter import MatrixWorkspaceDisplay
-p = R"C:\Users\qbr77747\dev\m\source\build\ExternalData\Testing\Data\UnitTest"
-#
-# all_nxs_files = []
-# for root, folders, files in os.walk(p):
-# nxs_files = list(filter(lambda x: x[-4:] == ".nxs" in x, files))
-# all_nxs_files.extend(nxs_files)
-#
-# print(all_nxs_files)
-
-# for f in all_nxs_files:
-# full_path = os.path.join(p, f)
app = QApplication([])
LOQ74044 = Load(os.path.join(p, r"LOQ74044.nxs"))
-import matplotlib
-
-# TODO remove before PR / figure our where to do it properly
-matplotlib.use('Qt5Agg')
-print("MPL version:", matplotlib.__version__)
-import matplotlib.pyplot as plt
-
-# ws = Load(os.path.join(p, r"AddedEvent-add.nxs"))
window = MatrixWorkspaceDisplay(LOQ74044, plt)
app.exec_()
diff --git a/qt/python/mantidqt/widgets/matrixworkspacedisplay/pixmaps.py b/qt/python/mantidqt/widgets/matrixworkspacedisplay/pixmaps.py
deleted file mode 100644
index 13a1e439be9374db1a8dd882db1c04dd2c54caba..0000000000000000000000000000000000000000
--- a/qt/python/mantidqt/widgets/matrixworkspacedisplay/pixmaps.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# Mantid Repository : https://github.com/mantidproject/mantid
-#
-# Copyright © 2018 ISIS Rutherford Appleton Laboratory UKRI,
-# NScD Oak Ridge National Laboratory, European Spallation Source
-# & Institut Laue - Langevin
-# SPDX - License - Identifier: GPL - 3.0 +
-# This file is part of the mantid workbench.
-#
-#
-copy_xpm = ["15 13 4 1",
- "# c None",
- ". c #000000",
- "b c #00007f",
- "a c #ffffff",
- "......#########",
- ".aaaa..########",
- ".aaaa.a.#######",
- ".a..a.bbbbbb###",
- ".aaaaabaaaabb##",
- ".a....baaaabab#",
- ".aaaaaba..abbbb",
- ".a....baaaaaaab",
- ".aaaaaba.....ab",
- "......baaaaaaab",
- "######ba.....ab",
- "######baaaaaaab",
- "######bbbbbbbbb"]
-table_xpm = [
- "15 16 5 1",
- "# c None",
- ". c #000000",
- "c c #2007f0",
- "b c #8f888f",
- "a c #ffffff",
- "..........#####",
- ".aaaaaaaa..####",
- ".aaaaaaaa.b.###",
- ".aaaaaaaa.bb.##",
- ".aaaaaaaa.bbb.#",
- ".aaaaaaaa.....#",
- ".aaaaaaaaaaaa.#",
- ".a.............",
- ".a.cc.cc.cc.cc.",
- ".a.............",
- ".a.aa.aa.aa.aa.",
- ".a.aa.aa.aa.aa.",
- ".a.............",
- ".a.aa.aa.aa.aa.",
- ".a.aa.aa.aa.aa.",
- "..............."]
-
-graph_xpm = [
- "14 14 6 1",
- " c None",
- ". c #030003",
- "+ c #FFFFFF",
- "@ c #FC0D00",
- "# c #2F28EF",
- "$ c #0000FC",
- "..............",
- ".++++@@++++++.",
- ".++++@@++++++.",
- ".+++@++@+++++.",
- ".++@++++@@+++.",
- ".+@+++++@@++#.",
- ".++++##+++@+#.",
- ".++++##++++$+.",
- ".+++#++#++$+@.",
- ".++#++++##+++.",
- ".+#+++++##+++.",
- ".++++++++++++.",
- ".++++++++++++.",
- ".............."]
-
-new_graph_xpm = [
- "14 16 5 1",
- " c None",
- ". c #000000",
- "+ c #FFFFFF",
- "@ c #A0A7AF",
- "# c #FF0000",
- ".......... ",
- ".++++++++.. ",
- ".++++++++.@. ",
- ".+..+++++.@@. ",
- ".++.+++++.....",
- ".++.+++++++++.",
- ".+..++##+++#+.",
- ".++.+#++#++#+.",
- ".++.+#++#++#+.",
- ".+..#++++##++.",
- ".++.#++++++++.",
- ".++.#++++++++.",
- ".+..........+.",
- ".++.++.++.+++.",
- ".++++++++++++.",
- ".............."]
diff --git a/qt/python/mantidqt/widgets/matrixworkspacedisplay/test_helpers/mockplotlib.py b/qt/python/mantidqt/widgets/matrixworkspacedisplay/test_helpers/mockplotlib.py
deleted file mode 100644
index 2225d85353975fb846656fab1bd459c617e18cc3..0000000000000000000000000000000000000000
--- a/qt/python/mantidqt/widgets/matrixworkspacedisplay/test_helpers/mockplotlib.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from mock import Mock
-
-
-class MockPlot:
- MOCK_PLOT_COLOR = "#notacolor"
-
- def __init__(self):
- self.get_color = Mock(return_value=self.MOCK_PLOT_COLOR)
-
-
-class MockPlotLibAx:
- def __init__(self):
- self.mock_plot = MockPlot()
- self.plot = Mock(return_value=[self.mock_plot])
- self.errorbar = Mock()
- self.legend = Mock()
-
-
-class MockPlotLibFig:
- def __init__(self):
- self.show = Mock()
-
-
-class MockPlotLib:
- """
- Mocks the Matplotlib interface for testing
- """
-
- def __init__(self):
- self.mock_fig = MockPlotLibFig()
- self.mock_ax = MockPlotLibAx()
- self.subplots = Mock(return_value=[self.mock_fig, self.mock_ax])