remove a few redundancies