Major cleanup with log messages.