VID-488 Remove unused message keys