Winner, Winner, Chicken Dinner.
Naval Jelly is outstanding for removing all rust. It contains phosphoric acid which quickly converts iron oxide to iron phosphate. Just wipe it off. Super easy to use. After rust removal, add what you like.
Applying something over the iron oxide doesn't get rid of it all.