remove some code; integration of i18n