Removing left behind dead code
Removing collection race conditions in tests for async handling