Removing NMS code