Revert accidental refactoring

-keeps changes from last commit for join handling threads