Did some refactoring.
Removed items that referred to scan.