NXP-10566: cleanup to make sonar happy