refactor: Remove re-exports

[rhinodavid]

Description

Attempting to unwind the circle of dependencies + inadvertent imports of re-exports.

Testing instructions

Types of changes

Checklist:

• [ ] Prefix PR title with [WIP] if necessary.
• [ ] Add tests to cover changes as needed.
• [ ] Update documentation as needed.
• [ ] Add new entries to the relevant CHANGELOG.jsons.