Refactoring: cleanup of LogMessageOnce