Remove some unecessary checks