On second thought, remove everything not related to the scanner