--- trunk/src/brains/SimInfo.cpp	2005/02/14 17:57:01	334
+++ trunk/src/brains/SimInfo.cpp	2005/03/09 17:30:29	413
@@ -73,7 +73,7 @@ SimInfo::SimInfo(std::vector<std::pair<MoleculeStamp*,
                                 nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
                                 nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
                                 nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
-                                sman_(NULL), fortranInitialized_(false), selectMan_(NULL) {
+                                sman_(NULL), fortranInitialized_(false) {
 
             
     std::vector<std::pair<MoleculeStamp*, int> >::iterator i;
@@ -139,19 +139,20 @@ SimInfo::SimInfo(std::vector<std::pair<MoleculeStamp*,
     molToProcMap_.resize(nGlobalMols_);
 #endif
 
-    selectMan_ = new SelectionManager(this);
-    selectMan_->selectAll();
 }
 
 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_;
     delete forceField_;
-    delete selectMan_;
 }
 
 int SimInfo::getNGlobalConstraints() {