Cleanup code for lazy-run executor

One commit from previous branch is missed