Improve unthread to chop off thread heads too