Ensure we extract non-Latin numbers
Since we've dropped 2.5 we don't need this if logic
Remove unnecessary code