Check Scanner - more cleanup