Refactored RemoveDiacritics
Revert "Refactored RemoveDiacritics"

This reverts commit 3372e121c78d6ab982146ede5b26914dff5ecd35.