removed unneeded I18n files and try BaseKlass