yipes, maybe you nuked it enough already. But since you're breaking the tank down because of this problem, you wanna make sure it's erradicated before setting it back up so you don;t find yourself in the same position as soon as you get fish back in there. Might take a little extra time but will probably save you a lot of time, $$ and aggravation in the long run to do it as well as you can the first time around you know?
I'm not trying to be a pain, just speaking from experience.
Good luck!