NXP-12435: remove old template relying on query models