diff --git a/Terminal.Gui/Core/Responder.cs b/Terminal.Gui/Core/Responder.cs
index 985f9dff3..7f43bb17a 100644
--- a/Terminal.Gui/Core/Responder.cs
+++ b/Terminal.Gui/Core/Responder.cs
@@ -240,11 +240,6 @@ namespace Terminal.Gui {
 			// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
 			Dispose (disposing: true);
 			GC.SuppressFinalize (this);
-#if DEBUG
-			WasDisposed = true;
-			Debug.Assert (DisposedCount == 0);
-			DisposedCount++;
-#endif
 		}
 	}
 }
diff --git a/UnitTests/ScenarioTests.cs b/UnitTests/ScenarioTests.cs
index 2fd1e56c3..c6d6723ce 100644
--- a/UnitTests/ScenarioTests.cs
+++ b/UnitTests/ScenarioTests.cs
@@ -71,11 +71,6 @@ namespace Terminal.Gui {
 				Assert.Equal (1, iterations);
 				Assert.Equal (stackSize, iterations);
 			}
-#if DEBUG
-			foreach (var inst in Responder.Instances) {
-				Assert.True (inst.WasDisposed);
-			}
-#endif
 		}
 
 		[Fact]