Autoglym glass polish. Orchard hydrophobe.
Halfords glass cutter is great for removing botched rainx applications.