Removed the rest of the old scheme where solvent and complex simulations could be run in parallel to make code maintenance simpler.