Got rid of template shit