--- a/Class.st	Mon Sep 04 10:34:26 2006 +0200
+++ b/Class.st	Mon Sep 04 19:17:26 2006 +0200
@@ -1318,15 +1318,6 @@
 
 !Class methodsFor:'adding & removing'!
 
-removeFromSystem
-    "ST-80 compatibility
-     remove myself from the system"
-
-    ^ Smalltalk removeClass:self
-
-    "Created: 6.2.1996 / 11:32:58 / stefan"
-!
-
 unload
     "{ Pragma: +optSpace }"
 
@@ -1401,6 +1392,18 @@
     "Modified: 4.6.1997 / 14:48:02 / cg"
 ! !
 
+!Class methodsFor:'adding/removing'!
+
+removeFromSystem
+    "ST-80 compatibility
+     remove myself from the system"
+
+    Smalltalk removeClass:self.
+    Smalltalk removeKey:name.
+
+    "Created: 6.2.1996 / 11:32:58 / stefan"
+! !
+
 
 !Class methodsFor:'changes management'!
 
@@ -4612,5 +4615,5 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.502 2006-08-30 13:32:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.503 2006-09-04 17:17:26 cg Exp $'
 ! !