Remove unneccessary checks