Cleaning up benchmark, further prep for new uproxy-lib changes.
Cleanup after uproxy-lib changes