nsh: api cleanup