Surface conditioning and polishing