I can't say I blame you - not only is it a very time consuming job there really is no 100% guarantee that you have removed every last bit of corrosion and it's just lurking in there ready to strike!!!
I guess I better get my finger out with the replacement WPC MPUs here then........
