cleanup of unused scanner code