Remove dependence on C2HS module