NXP-14013: clean a bit