Suggestions on Herbal Diuretics

Any suggestions for herbal diuretics that are not banned substances by the IOC.  So far I can think of caffeine and pseudoephedrine. 

Thanks

Dandellion root helps eliminate water. Might be counterproductive if you have an endurance event.