more code & i18n cleanup after model refactoring