Cleaning out some more cruft; logging seems to work as expected now