MolSim cleaned up