Deleted useless checks