Doran -
Glad you finally took the plunge and yanked the tank out - trust me, you won't regret it!! Definitely try to reuse the original (as the guys have suggested) - it'll make everything easier. A couple days of heavy duty cleaners, water and vigorous shaking took care of mine - haven't had a tank related problem since. Good luck bud!