NXP-14013 small - cleanup