Removed solventSolvent calc until properly defined