If it were me, I would just reset the traps that didn't have a catch. As for the wax, if you think it may have a foreign odor, I would just scrape off the outside layer of wax then re-use that also. I heard wax can take on a burnt smell if it gets too hot but I never had any issues with the wax I use. I just add more to the pot when needed from year to year. I use a "fry daddy" that my wife picked up at a yard sale to heat my wax. I like it because I can control the temperature by simply setting the knob. Good luck with whatever you decide.