Index: src/Common/DelftTools.Utils/DelftTools.Utils.csproj
===================================================================
diff -u -r36f21b76dcc0ac2f8d06ecfa4495faef04c59a84 -ra5b1ae6a761e1cafbb0084db15d5526b08a447c9
--- src/Common/DelftTools.Utils/DelftTools.Utils.csproj	(.../DelftTools.Utils.csproj)	(revision 36f21b76dcc0ac2f8d06ecfa4495faef04c59a84)
+++ src/Common/DelftTools.Utils/DelftTools.Utils.csproj	(.../DelftTools.Utils.csproj)	(revision a5b1ae6a761e1cafbb0084db15d5526b08a447c9)
@@ -266,7 +266,6 @@
     <Compile Include="Remoting\RemoteInstanceContainer.cs" />
     <Compile Include="SnappingCalculator.cs" />
     <Compile Include="TextDocument.cs" />
-    <Compile Include="Threading\DelayedEventHandler.cs" />
     <Compile Include="DeltaShellDateTimeConverter.cs" />
     <Compile Include="Drawing\ColorHelper.cs" />
     <Compile Include="Drawing\ImageExtensions.cs" />
@@ -289,7 +288,6 @@
     <Compile Include="Reflection\TypeUtils.cs" />
     <Compile Include="RegularExpressions\RegularExpression.cs" />
     <Compile Include="StringExtensions.cs" />
-    <Compile Include="Threading\DelayedEventHandlerController.cs" />
     <Compile Include="Threading\QueueStateChangedEventArgs.cs" />
     <Compile Include="Threading\ThreadsafeBindingList.cs" />
     <Compile Include="Tuple.cs" />
Fisheye: Tag a5b1ae6a761e1cafbb0084db15d5526b08a447c9 refers to a dead (removed) revision in file `src/Common/DelftTools.Utils/Threading/DelayedEventHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5b1ae6a761e1cafbb0084db15d5526b08a447c9 refers to a dead (removed) revision in file `src/Common/DelftTools.Utils/Threading/DelayedEventHandlerController.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Common/SharpMap.UI/Forms/MapControl.cs
===================================================================
diff -u -r685868ff25d1872c06c286a66dff024a1476dd31 -ra5b1ae6a761e1cafbb0084db15d5526b08a447c9
--- src/Common/SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision 685868ff25d1872c06c286a66dff024a1476dd31)
+++ src/Common/SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision a5b1ae6a761e1cafbb0084db15d5526b08a447c9)
@@ -234,12 +234,9 @@
         [InvokeRequired]
         public override void Refresh()
         {
-            if (inRefresh)
-                return;
-
-            if (!DelayedEventHandlerController.FireEvents || disposed)
+            if (inRefresh || disposed)
             {
-                return; //no refreshing..bleh
+                return;
             }
             
             if (refreshTimer != null)
@@ -585,11 +582,6 @@
 
         protected override void OnPaint(PaintEventArgs e)
         {
-            //HACK: check if this works and then move this code/logic elsewhere
-            if (!DelayedEventHandlerController.FireEvents)
-            {
-                return;//stop painting..
-            }
             if (Map == null || Map.Image == null)
             {
                 return;
Index: src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -ra5b1ae6a761e1cafbb0084db15d5526b08a447c9
--- src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs	(.../DeltaShellApplication.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs	(.../DeltaShellApplication.cs)	(revision a5b1ae6a761e1cafbb0084db15d5526b08a447c9)
@@ -82,7 +82,6 @@
             plugins = new List<ApplicationPlugin>();
 
             ActivityRunner = new ActivityRunner();
-            ActivityRunner.IsRunningChanged += ActivityRunnerIsRunningChanged;
 
             if (RunningActivityLogAppender.Instance != null)
             {
@@ -103,12 +102,6 @@
             return AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(asm => asm.FullName == args.Name);
         }
 
-        void ActivityRunnerIsRunningChanged(object sender, EventArgs e)
-        {
-            //don't fire events while running models
-            DelayedEventHandlerController.FireEvents = !ActivityRunner.IsRunning;
-        }
-
         public ApplicationPlugin GetPluginForType(Type type)
         {
             foreach (var plugin in plugins)
@@ -842,8 +835,6 @@
             {
                 if (disposing)
                 {
-                    ActivityRunner.IsRunningChanged -= ActivityRunnerIsRunningChanged;
-
                     CloseProject();  
                     
                     projectBeingCreated = null;
Fisheye: Tag a5b1ae6a761e1cafbb0084db15d5526b08a447c9 refers to a dead (removed) revision in file `test/Common/DelftTools.Utils.Tests/DelayedEventHandlerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/Common/DelftTools.Utils.Tests/DelftTools.Utils.Tests.csproj
===================================================================
diff -u -r1ec342fe811597ee53a457e29c72399c8ddf719f -ra5b1ae6a761e1cafbb0084db15d5526b08a447c9
--- test/Common/DelftTools.Utils.Tests/DelftTools.Utils.Tests.csproj	(.../DelftTools.Utils.Tests.csproj)	(revision 1ec342fe811597ee53a457e29c72399c8ddf719f)
+++ test/Common/DelftTools.Utils.Tests/DelftTools.Utils.Tests.csproj	(.../DelftTools.Utils.Tests.csproj)	(revision a5b1ae6a761e1cafbb0084db15d5526b08a447c9)
@@ -154,9 +154,6 @@
     <Compile Include="ConversionHelperTest.cs" />
     <Compile Include="DateTimeExtensionsTests.cs" />
     <Compile Include="DateTimeFormatGuesserTest.cs" />
-    <Compile Include="DelayedEventHandlerTest.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="DeltaShellTimeSpanConverterTest.cs" />
     <Compile Include="ExcelFormulaTest.cs" />
     <Compile Include="General\TypeConverterTest.cs" />