cosmetic: remove commented-out code
refactor: move action state to wti (as we are now on a per-thread basis)