Remove useless code
Update test