Cleanup of the console log messages (OMS-314)