Remove use of  function.