Further cleanup, remove encoding since we now use utf-8 for all languages