Fixed enconding issues and deleted not used class