remove additional potential null pointers