INT-2855 Polishing

Eliminate unnecessary CountDownLatch.