Removing cyclic deps