Logging cleanup (OMS-50)