Any sport where going to the Olympics is not the ultimate goal should be out.
Honestly, name me one tennis player who, when they start, say to themselves 'I want to compete in the Olympic Games'. If you play tennis, you play for Grand Slams, not Olympic berths. Tennis should be out, golf...