removing useless checks