Having Just done this...
Just finished cleaning the entire cockpit area of my Cat 30 last week. She was quite marked up from a summer of traffic, and lax no black soles policy. Also water stains from principal drain points and drain areas. For the marks, I used 3M cleaner & wax and lots of elbow grease! Don't be shy on using either. when in doubt, more of both! 3M makes three grades of the cleaner/wax stuff, I used the middle one for medium oxidation. For the stains, I used a gell (made by Davis, I think) that looks exactly like blue hair gell. Dab it on, wait a few minutes, then wipe & rinse. Some tough spots took two to three cycles of this. But voila! stains are gone! (this uses less elbow grease than the cleaner/wax. thank goodness, I needed the break)