Deleted unicode handling from scanner