Fix nightly test failure, following my previous replication cleanup.
The test was failing due to concurrent modification exception. Using an iterator now to permit removing items from the map during the iteration.
Additional minor cleanup.