Remove some checks