Remove some redundancies.