NMS-5982 Clean up NCS packaging.