Disclosed is a process for the upgrading of heavy oils and bitumens, where the total feed to the process can include heavy oil or bitumen, water, and diluent. The process can include the steps of solvent deasphalting 110 the total feed 105 to recover an asphaltene fraction 116, a deasphalted oil fraction 118 essentially free of asphaltenes, a water fraction 112, and a solvent fraction 114. The process allows removal of salts from the heavy oils and bitumens either into the aqueous products or with the asphaltene product.