Rid of template stuff