NXP-10886: cleanup now useless code