Remove unused messages and help greppers with comments
According to a simple script (and subsequent manual check), 4 messages
aren't used anywhere, so I'm removing them. Also, add comments with all
variation of messages. Comments are cheap and help when grepping.
In case I erroneously removed an actually used message, please tell me and make it clear where it's used.
(cherry picked from commit 31b90627623c5ccab0c707c13bf0041a6d6e8b81)