cleanup concurrency a bit