Water polishing