Remove threads, switch to tasks.  Make quit faster