Added strip_solvent flag.