Remove dep on sugar.