Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -ra22387226e61ab8633b670aea078f26900ed1883 -r05a035ad71638422c128aba30e06cdcb58ac5609
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision a22387226e61ab8633b670aea078f26900ed1883)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 05a035ad71638422c128aba30e06cdcb58ac5609)
@@ -119,7 +119,7 @@
                 LicenseFilePath = "..\\Licentie.rtf",
                 ManualFilePath = "Ringtoets_Manual.pdf"
             };
-            var mainWindow = new MainWindow(null);
+            var mainWindow = new MainWindow();
             gui = new RingtoetsGui(mainWindow, new StorageSqLite(), applicationCore, settings)
             {
                 Plugins =
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r036e0a34388dcbb74900cb6c64242cf194b32783 -r05a035ad71638422c128aba30e06cdcb58ac5609
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 036e0a34388dcbb74900cb6c64242cf194b32783)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 05a035ad71638422c128aba30e06cdcb58ac5609)
@@ -76,9 +76,8 @@
 
         private IGui gui;
 
-        public MainWindow(IGui gui)
+        public MainWindow()
         {
-            Gui = gui;
             InitializeComponent();
 
             windowInteropHelper = new WindowInteropHelper(this);
Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs
===================================================================
diff -u -r7b50ce0ee44b9412f05dbdb1da89d0ee25d4e7ac -r05a035ad71638422c128aba30e06cdcb58ac5609
--- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 7b50ce0ee44b9412f05dbdb1da89d0ee25d4e7ac)
+++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 05a035ad71638422c128aba30e06cdcb58ac5609)
@@ -55,9 +55,6 @@
 
             var unary = expression.Body as UnaryExpression;
 
-            // If the method gets a lambda expression 
-            // that is not a member access,
-            // for example, () => x + y, an exception is thrown.
             if (unary != null)
             {
                 return GetMemberNameFromMemberExpression(unary.Operand as MemberExpression);
@@ -198,9 +195,6 @@
 
         private static string GetMemberNameFromMemberExpression(MemberExpression member)
         {
-            // If the method gets a lambda expression 
-            // that is not a member access,
-            // for example, () => x + y, an exception is thrown.
             if (member != null)
             {
                 return member.Member.Name;
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -ra22387226e61ab8633b670aea078f26900ed1883 -r05a035ad71638422c128aba30e06cdcb58ac5609
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision a22387226e61ab8633b670aea078f26900ed1883)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 05a035ad71638422c128aba30e06cdcb58ac5609)
@@ -31,7 +31,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 var applicationCore = gui.ApplicationCore;
 
@@ -58,7 +58,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 gui.Plugins.Add(new ProjectExplorerGuiPlugin());
                 gui.Run();
@@ -78,7 +78,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 gui.Run();
                 int callCount = 0;
@@ -96,7 +96,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 gui.Plugins.Add(new ProjectExplorerGuiPlugin());
                 gui.Run();
@@ -117,7 +117,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 var applicationCore = gui.ApplicationCore;
 
Index: Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs
===================================================================
diff -u -ra22387226e61ab8633b670aea078f26900ed1883 -r05a035ad71638422c128aba30e06cdcb58ac5609
--- Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision a22387226e61ab8633b670aea078f26900ed1883)
+++ Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision 05a035ad71638422c128aba30e06cdcb58ac5609)
@@ -25,7 +25,7 @@
             applicationCore.Expect(ac => ac.Dispose());
             mocks.ReplayAll();
 
-            var gui = new RingtoetsGui(new MainWindow(null), projectStore, applicationCore);
+            var gui = new RingtoetsGui(new MainWindow(), projectStore, applicationCore);
 
             // Call
             gui.Dispose();
@@ -42,7 +42,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (new RingtoetsGui(new MainWindow(null), projectStore))
+            using (new RingtoetsGui(new MainWindow(), projectStore))
             {
                 Assert.NotNull(ViewPropertyEditor.ViewCommands);
             }
@@ -58,7 +58,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var ringtoetsGui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var ringtoetsGui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 var rootData = new object();
 
@@ -97,7 +97,7 @@
             plugin2.Stub(p => p.Deactivate());
             mocks.ReplayAll();
 
-            using (var ringtoetsGui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var ringtoetsGui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 ringtoetsGui.Plugins.Add(plugin1);
                 ringtoetsGui.Plugins.Add(plugin2);
@@ -149,7 +149,7 @@
             plugin2.Stub(p => p.Deactivate());
             mocks.ReplayAll();
 
-            using (var ringtoetsGui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var ringtoetsGui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 ringtoetsGui.Plugins.Add(plugin1);
                 ringtoetsGui.Plugins.Add(plugin2);
@@ -176,7 +176,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 gui.Run();
 
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs
===================================================================
diff -u -ra22387226e61ab8633b670aea078f26900ed1883 -r05a035ad71638422c128aba30e06cdcb58ac5609
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision a22387226e61ab8633b670aea078f26900ed1883)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision 05a035ad71638422c128aba30e06cdcb58ac5609)
@@ -134,7 +134,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 var plugin = new OxyPlotGuiPlugin();
                 IView viewMock = isChartViewActive ? (IView)new TestChartView() : new TestView();
@@ -173,7 +173,7 @@
             var projectStore = mocks.Stub<IStoreProject>();
             mocks.ReplayAll();
 
-            using (var gui = new RingtoetsGui(new MainWindow(null), projectStore))
+            using (var gui = new RingtoetsGui(new MainWindow(), projectStore))
             {
                 var plugin = new OxyPlotGuiPlugin();
                 var testChartView = new TestChartView();