clean up overzealous logging stage one

some more coming...