added scan/retry flow; cleanup
missed in last commit