Removed redundant null checks