Remove unused + fix possible unicode issue