unnecessary bimolecular diffusion computations removed
complete separation between diffusion and self-diffusion