If you don't have a set of taps maybe pick one up too. Cleaning out rust, paint and dirt with a tap will make things easier.

George