NXP-14367 classpath cleanup