Small refactor.
Rmove useless code.