Removing cell_based_solvent (to be readded as a submodule).