--- trunk/OOPSE-3.0/src/brains/SimInfo.cpp	2005/02/14 17:57:01	2018
+++ trunk/OOPSE-3.0/src/brains/SimInfo.cpp	2005/03/07 22:39:33	2082
@@ -144,9 +144,13 @@ SimInfo::~SimInfo() {
 }
 
 SimInfo::~SimInfo() {
-    //MemoryUtils::deleteVectorOfPointer(molecules_);
-
-    MemoryUtils::deleteVectorOfPointer(moleculeStamps_);
+    std::map<int, Molecule*>::iterator i;
+    for (i = molecules_.begin(); i != molecules_.end(); ++i) {
+        delete i->second;
+    }
+    molecules_.clear();
+    
+    MemoryUtils::deletePointers(moleculeStamps_);
     
     delete sman_;
     delete simParams_;