Remove unnecessary templating