NXP-14413: cleanup, use unicode