Removed traces of template stuff :)