GALAXY-834 - Removing usage of charlock_holmes