I also cloth diapered for awhile and I agree with the white vinegar suggestions. I just wanted to add that a great way to do that is to get one of those "Downy balls" and put the vinegar in there. Add it to the wash, but the ball won't open until the rinse cycle, where you want it. (I would never remember to put it in the rinse cycle otherwise). Also, baking soda is good, but DO NOT put them together--one or the other. And no fabric softener--that just masks the problem, doesn't take care of it. Hope that helps!