Removed deferred threads, seems to increase robustness.