Anyone have recommendations for post development cleaning of negatives (mainly 35mm and 4x5).

I live in an area which uses treated ground water which has a very high lime content, and so I use deionized water for final rinse but still get drying marks and what appears to be lime deposits. I use Hypo clearing agent prior to final wash but do not squeege for fear of scratching.

I try to keep handling down to a minimum and I am not a lover of solvents but would use if necassary