Removing circular dependencies