- removed useless checks