No more required function deleted and two functions renamed.