Refactored thread deletion a bit to avoid confusion.
fr