Remove dep cycle some more