removed useless checks