Fix bugs but remove threads