Remove extra NULL checks