Remove some unneeded checks