Remove dep cycle