Update to latest libsc simplify branch