I vote fo a ban on gymnastics then. Far more dangerous than windsurfing.
Pole vault should also be banned as there is no risk assessment in place for working at height
Weight lifting, shot putt etc. should also be banned until they are reviewed under manual handling regs. probably banned afterwards as well.
Javelin anyone? No thanks. A bunch of people throwing spears in a stadium of people. Far too risky.
People with guns! REAL ONES!!! Archery as well of course.
The trip hazards in the hurdles should be removed immediately
Ear plugs should be issued to all competitors with races starting with a gun (Should be banned) due to excessive noise.
And especially for us Brits. Welfare stations should be provided along the marathon route in case someone is caught short.