Remove some redundancy