Logging cleanups