Removing optimization which exposes us to missing timeouts due to a race condition
Removing redundant update
Cleanup traces