rework KillAction so it works with the new code