More cleanup of logging framework