Took thread removal out of 19420 (not necessary and sometimes fails).