Removed useless checks