Removing template crap