Merge pull request #2908 from TheBlueMatt/2024-02-drop-useless-refs