Remove some redudant checks