Ned/clean up i18n tools

[LMS-2253]