Quick remove underscores in messages

Change-Id: Iacb3ff24f1a000ab9cca312852c11e1c783c0f6f