remove some extraneous logging and test mocks
pull master