well, a tap is ok but i use an old head bolt. if you have the head off, you should have a box of new bolts. take an old bolt, cut a groove into the threads and use that for a cleaner. the groove allows the crap to come out. machinists have avoided taps for fear it might remove metal also. good luck, chuck.