Remove unnecessary if statement
Merge pull request #541 from elyezer/unicode-refactor

Remove unnecessary if statement