Remove unused messages that weren't removed in [16817]