sonar cleanups for a number of things, including the first half of RescanProcessor