--- a/ProjectBrowser.st	Tue Mar 30 20:37:28 1999 +0200
+++ b/ProjectBrowser.st	Tue Mar 30 20:59:37 1999 +0200
@@ -2304,55 +2304,10 @@
 loadClassesFromDirectory
     "load all classes as contained in the project into the system"
 
-    |p ns cls|
-
-    p := self currentProject.
-    ns := p defaultNameSpace.
-
     self withReadCursorDo:[
-        "/ read once ...
-        p classInfo do:[:clsInfo |
-            |clsName clsFileName|
-
-            clsName := clsInfo className.
-            clsFileName := clsInfo classFileName.
-            clsFileName isNil ifTrue:[clsFileName := clsName , '.st'].
-
-            clsName isSymbol ifTrue:[
-                cls := ns at:clsName.
-                cls isNil ifTrue:[
-                    "/ ok - really not yet loaded.
-                    Transcript showCR:'loading ' , (p directory asFilename construct:clsFileName) pathName , ' ...'.
-                    Smalltalk fileIn:(p directory asFilename construct:clsFileName)
-                ] ifFalse:[
-                    self halt
-                ].
-            ] ifFalse:[
-                self halt
-            ].
-        ].
-
-        "/ read again; if the load order was not correct,
-        "/ this will fix things (i.e. nil superclasses ...)
-        
-        p classInfo do:[:clsInfo |
-            |clsName clsFileName|
-
-            clsName := clsInfo className.
-            clsFileName := clsInfo classFileName.
-            clsFileName isNil ifTrue:[clsFileName := clsName , '.st'].
-
-            clsName isSymbol ifTrue:[
-                Transcript showCR:'loading ' , (p directory asFilename construct:clsFileName) pathName , ' ...'.
-                Smalltalk fileIn:(p directory asFilename construct:clsFileName)
-            ] ifFalse:[
-                self halt
-            ].
-        ].
+        self currentProject loadClassesFromProjectDirectory.
     ].
 
-    self halt.
-
 !
 
 loadFromProjectFile:aFilenameString
@@ -2452,7 +2407,10 @@
         projectToRemove := selectedNode contents.
 
         (self confirm:'Really remove the project ?') ifTrue:[
-            self projectTreeHolder removeSelection
+            self withExecuteCursorDo:[
+                self projectTreeHolder removeSelection.
+                projectToRemove removeFromSystem.
+            ]
         ]
     ]
 !