CODE-31: Rename a message bundle string.
CODE-31: Remove an unneeded event handler.