Remove full file search with goto loine logic instead.