Removed the header function from the template helper and header files