Updates in support of integration testing. Remove extraneous code.