Removing unnecessary templating