Removed dedicated scanner delegates, leveraging injection to compose scanner