NXP-12435: remove query models and result providers