Merge "Code cleanup on NMPS and NMS." into nyc-dev