Fix for from_utf8 change
Remove dead code