Remove unnessesary thread wrapper
Add pong_timer chancelling