Remove some useless defensive checks