Update waitForEdge

Removed re-initializing during polling.