Clarify log message + cleanup (OMS-372)