Remove unecessary checks