Okay it's coming up pretty quick on a new paint job and I really want all the glass to look new

So is there any tricks to cleaning them/ polishing.

 

In my experience, the only way to get the glass to look new is to buy new glass. You can try polishing it, but only the most superficial of scratches will polish out. Anything you can feel with your fingernail, such as perhaps windshield wiper swish marks, is too deep to polish out.

 

If the glass is in good shape, clean them good with vinegar and then use the best ammonia based window cleaner you can find, I buy mine at a glass shop, I also used a fine scotch bright pad. My glass is almost 50 years old and still looks great.

 

Thanks guys will be cleaning these up the next few days.
Front windshield will be replaced as I cracked it on removal

 

New glass is the way to go but you can hide some scratches with lemon pledge. You need to finish polish it with a micro-fibre cloth.