OPT benchmark cleanup