NXP-15638: cleanup