Removed circular references