Remove redundant null-check