I've always been a green tea fan for natural diuretic action. Drinking tons of water and alternating green tea is nice for a kidney flush.
Not to be a jerk--but ONLY 24 ounces? DRINK MORE!
Only to a small extent though that is barely noticeable. High dose vitamin c works even better imo.
Mike