NXP-12218: cleanup thanks to Sonar