Remove some redundant checks