Remove redundant is_file() checks