Removing multithreading - too buggy