Clean up main branch, removing lingering directories

[iameskild]

Reference Issues or PRs

I can't push to the protected release/2023.10.1 branch but these changes need to be included. These are the result of improperly resolving merge conflicts.

What does this implement/fix?

Put a x in the boxes that apply

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds a feature)
• Breaking change (fix or feature that would cause existing features not to work as expected)
• Documentation Update
• Code style update (formatting, renaming)
• Refactoring (no functional changes, no API changes)
• Build related changes
• Other (please describe):

Testing

• Did you test the pull request locally?
• Did you add new tests?

Any other comments?