try a "chaser" tap or a "roll form" tap. both with grease. very, very minute chips [if any] made. way better than using a "cut" [ordinary] tap if just cleaning up the threads is the goal.