Remove (commented-out) race condition