clean up scans forms and flow