removed circular import logic