Remove intl dependency