Merge "Cleanup thread types"