How we repaired the threads in our RV water heater

For cleaning up large pipe threads for which I don't have a tap, I use a steel nipple and cut 3 grooves evenly spaced and parallel with the pipe across the threads. I use a cut off wheel in my portable grinder and only cut thread deep. This gives it a cutting edge and a gap for material to collect. Works just like a tap.
Dave