Removed some useless checks