I concur. Leave choke tubes in while scrubbing the barrel. Once damanged, thus why take the risk?, your choke tube barrel screws will never be the same.
Now for my question of the day, after patterning my new Super Black Eagle II 3.5" I have found I shoot high and left consistenly. I want to adjust shims and re pattern, which should I use?