Removed some unnecessary checks.