removed circular dependencies