More clean up.
Removed Persian strings and used Unicode version of them.