Remove use of NMS and CB classes.