Strongest Kidney Stone Remedy

I am not sure how much of my fluid retention problem is kidneys, and how much is liver, but I developed 30 pounds of fluid retention in the first 9 weeks of Andy Cutler chelation.

I have concluded that I developed kidney and liver congestion with the mercury detox, so am focusing now on decongesting both.

I am doing regular liver flushes, but wanting to be sure I'm attacking the kidneys as much as I can, as well.

I've had a lot of hair loss, mostly on the sides of my head; I have dark under-eye circles; I have several of the white pimples under my eyes that Andreas Moritz says are indicative of kidney stones. These in addition to the significant fluid retention.

I did about 6 weeks on Moritz' kidney tea; I've used 2 bottles of Renaven; I'm taking 150 drops of chanca piedra a day, and I'm taking about 1 Tbsp. of Gold Coin Grass daily.

I read that Celery Seed Tea is good for flushing the kidneys out, but also that some were not sure it was dissolving the stones, or merely getting rid of extra water.

What are the strongest kidney stone dissolvers out there? Does Celery Seed Tea actually dissolve the stones?

Thanks SO MUCH for any insight!!!