cleaning up so that the basic op/client demo (almost) works out of the box