Polishing Bonnets and Discs