About a month ago we noticed our faucets were getting clogged up with calcium only for the hot water. So we flushed out the water heater and it did not help. The water heater was old and the water was not very hot so we finally replaced the water heater and everything was fine for about a week but now we are seeing a return of the calcium and it is clogging the faucets up again. How can I get rid of this problem?