Logging cleanup

Logging cleanup