Index: Core/Common/src/Core.Common.Gui/GuiCore.cs
===================================================================
diff -u -ra115adcc3554f90e3375c8db490a1ac2d5662cb4 -r7749811b0fd3f71505aee46d6ab26592c787f04c
--- Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision a115adcc3554f90e3375c8db490a1ac2d5662cb4)
+++ Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision 7749811b0fd3f71505aee46d6ab26592c787f04c)
@@ -261,7 +261,6 @@
                     currentSelectionProvider.SelectionChanged -= OnSelectionChanged;
                 }
 
-                // Dispose managed resources. TODO: double check if we need to dispose managed resources?
                 if (mainWindow != null && !mainWindow.IsWindowDisposed)
                 {
                     mainWindow.Dispose();
Index: Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -r7749811b0fd3f71505aee46d6ab26592c787f04c
--- Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs	(.../GuiTestHelper.cs)	(revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs	(.../GuiTestHelper.cs)	(revision 7749811b0fd3f71505aee46d6ab26592c787f04c)
@@ -30,8 +30,6 @@
 {
     /// <summary>
     /// Used by WindowsFormsTestHelper and WpfTestHelper
-    /// 
-    /// TODO: invert it - use GuiTestHelper as entry point in tests.
     /// </summary>
     public class GuiTestHelper
     {
Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u -r12b44cbe79ad3d86ba6e77b296e086b57e33a7cd -r7749811b0fd3f71505aee46d6ab26592c787f04c
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 12b44cbe79ad3d86ba6e77b296e086b57e33a7cd)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 7749811b0fd3f71505aee46d6ab26592c787f04c)
@@ -670,7 +670,7 @@
         {
             const string solutionName = "Riskeer.sln";
             //get the current directory and scope up
-            //TODO find a faster safer method 
+
             var testContext = new TestContext(new TestExecutionContext.AdhocContext());
             string curDir = testContext.TestDirectory;
             while (Directory.Exists(curDir) && !File.Exists(curDir + @"\" + solutionName))