Merge pull request #2766 from TheBlueMatt/2023-12-2314-cleanups-2