Merge pull request #2769 from TheBlueMatt/2023-12-2314-cleanups-3