Remove unnecessary classes and add throws clause to I18N::find(String)