Remove charlock_holmes
Update to support 6-2-stable