Remove null usage I introduced