Merge "Remove unused methods from NMS" into main