Getting rid of template