Cleanup for another attempt at scanning