NXP-12435: more cleanup of old query models deps