Remove concurrency - there were race conditions