Cleanup unnecessary null check