Remove dead code and fixup event wait_src setting from delegate.

Unclear how this slipped through unnoticed.