Merge pull request #2765 from TheBlueMatt/2023-12-2314-cleanups-1