NXP-12218: cleanup thanks to Sonar
NXP-10566: remove useless and deprecated EL deps