Code improvement

Remove useless code.