code cleanup, trying to fix emoiji support