Additional cleanup; removing a lot of extraneous log messages.