Perf improv batch 1 from #1648

[kien-ngo]

Problem solved

This is a subset of the changes from the draft PR below. Since #1648 contains too many changes I will split it up into smaller PRs
Context: #1648

Changes made

• Public API changes: list the public API changes made if any
• Internal API changes: explain the internal logic changes

How to test

• Automated tests: link to unit test file
• Manual tests: step by step instructions on how to test

[changeset-bot]

⚠️ No Changeset found

Latest commit: ce2fcc5

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR