Removed some checks