Last big of logging cleanup