Add UTF-8 encoding and remove unused module