Remove cycle dependency