FastScan: simplify some code by removing a complete class