NXP-11061: cleanup templates