NXP-14367 classpath and deployment cleanup