Removing cyclic dependencies