More cleaning
Remove useless duplicate of a method
Remove useless duplicate of a method