ref #6566 Clean up of dependencies and i18n