Cleaned up unnecessary checks.