more i18n and removing unused code