Remove dep on origami