Merge "cleanup for concurrency"