removed templating