Some null checks removed (not required)