NXP-15522: cleanup