Closes #542 by moving scan.deleting = true