VID-867 Fix the i18n messages as well to elminate unused messages