removed crappy templating code