NS cleanup + NH mapping code added.