remove redundant null-check