NXP-12435: format
NXP-12435: remove dep to query models