Removed most concurrency