Merge "Remove scanFile argument"