Remove unnessary checks