Remove some redundancies