Remove dep on solve