OPT benchmark cleanup
Merge pull request #16 from spilgames/benchmark-cleanup

OPT benchmark cleanup