Removing punycode dependency