[nps] minor cleanup