restored cyrillic support, removed unneeded code