[TAV-352] Finesse run polling mechanism.

No longer has unused code or locals passed in.