More cleanup of logging code