removed templating calls