Index: Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs
===================================================================
diff -u -r77238b032be21dcdd12920dd1fb894d7a78b52f3 -r7f956036be9cd34131e6432a638c04e28e4c6fb0
--- Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs	(.../GuiUpdateHandler.cs)	(revision 77238b032be21dcdd12920dd1fb894d7a78b52f3)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs	(.../GuiUpdateHandler.cs)	(revision 7f956036be9cd34131e6432a638c04e28e4c6fb0)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs
===================================================================
diff -u -r77238b032be21dcdd12920dd1fb894d7a78b52f3 -r7f956036be9cd34131e6432a638c04e28e4c6fb0
--- Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs	(.../GuiUpdateHandlerTest.cs)	(revision 77238b032be21dcdd12920dd1fb894d7a78b52f3)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs	(.../GuiUpdateHandlerTest.cs)	(revision 7f956036be9cd34131e6432a638c04e28e4c6fb0)
@@ -292,7 +292,7 @@
 
             var mockRepository = new MockRepository();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
-            inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator.Filter)).Return(filePath);
+            inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return(filePath);
             var fileImporter = mockRepository.Stub<IFileImporter>();
             mockRepository.ReplayAll();
 
@@ -349,7 +349,7 @@
 
             var mockRepository = new MockRepository();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
-            inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null);
+            inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null);
             var fileImporter = mockRepository.Stub<IFileImporter>();
             mockRepository.ReplayAll();
 
@@ -390,7 +390,7 @@
 
             var mockRepository = new MockRepository();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
-            inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null);
+            inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null);
             var fileImporter = mockRepository.Stub<IFileImporter>();
             mockRepository.ReplayAll();
 
@@ -432,7 +432,7 @@
             var targetObject = new object();
             var mockRepository = new MockRepository();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
-            inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator.Filter)).Return("/some/path");
+            inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return("/some/path");
             var fileImporter = mockRepository.Stub<IFileImporter>();
             mockRepository.ReplayAll();