i18n cleanup
collaborator cleanup