--- a/AbstractLauncherApplication.st	Tue Jul 09 21:38:30 2013 +0200
+++ b/AbstractLauncherApplication.st	Tue Jul 09 22:23:16 2013 +0200
@@ -1286,8 +1286,17 @@
     "open a browser showing all breakPointed/traced methods
      (but, to get rid of them, there is also a menu itme to remove them all)"
 
+    |filter|
+
+    "/ only methods which are still anchored in the class are relevant here
+    "/ (i.e. allInstances may return too many)
+    filter := [:m | m mclass notNil].
+
     UserPreferences systemBrowserClass
-        browseMethods:(WrappedMethod allInstances)
+        browseMethods:(Set new
+                        addAll:(WrappedMethod allInstances select:filter);
+                        addAll:(MethodWithBreakpoints allInstances select:filter);
+                        yourself)
         title:'All breakPointed/traced methods'
 !
 
@@ -1491,7 +1500,10 @@
 
     self
         withCursor:Cursor execute
-        do:[ MessageTracer cleanup]
+        do:[ 
+            MessageTracer cleanup.
+            MethodWithBreakpoints allInstancesDo:[:m | m restoreOriginalMethod]
+        ]
 !
 
 startClassBrowser
@@ -7042,14 +7054,14 @@
 !AbstractLauncherApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.435 2013-07-09 19:17:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.436 2013-07-09 20:23:16 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.435 2013-07-09 19:17:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.436 2013-07-09 20:23:16 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: AbstractLauncherApplication.st,v 1.435 2013-07-09 19:17:42 cg Exp $'
+    ^ '$Id: AbstractLauncherApplication.st,v 1.436 2013-07-09 20:23:16 cg Exp $'
 ! !