Commit fixing that threads not cleaning up after themselves.