please read this entire thread and all the steps and incorporate as many of these into your life as you can including the herbs and foods that help the kidneys etc.
Also try organic parsley root tincture for water retention. It is great for the kidneys. I would also take organic burdock root tincture. The general dose for tinctures is about 60 drops 3 to 5 times a day. Be sure your tincture whether you make it or it is store bought (herbpharm is a good brand) is organic or wildcrafted and not using conventional and far less potent herbs with poor quality.