NXP-11286 global cleanup