finish the rescan processor cleanup (still not clean, but better)