eliminated some obc/nms code