Removed dependency on jsc-cherion