remove unnecessary null check for ordered map iteration