Remove warning, remove useless null check