NXP-12756 cleanup