Some clean up in iota_scanner