Tidy up main (#3812)

Release Notes:

- N/A

Joseph T. Lyons committed 2y ago

41fb29bc5acd9e248880bee390c518a46536d10e

Committed by GitHub <noreply@github.com> on 12/25/2023, 12:45:39 PM