NXP-15452: Clean up of classes not used anymore