Remove unused line
Additional comment
Add timeout to thread_join.