Remove useless code in `add`, tidy up