Revert "Scanner fixed"

This reverts commit 6169194dbe2d75fc02584b38e31353e5c48947d4.
Revert "Scanner"

This reverts commit 656d0d2f2a397883ba7583f14f1aa87ecd61e247.