Remove remnants of template system