Scan: added more artificial features
Scan: removed some unused code