post refactor cleanup #2084

Job	Run time
build-test-downstream (macos-15, macos-15-armv8-clang-14, macos-15-armv8-clang-14)	1m 52s
build-test-downstream (ubuntu-24.04, ubuntu-24.04-gcc-14, ubuntu-24.04-gcc-14)	2m 38s
build (ubuntu-24.04, ubuntu-24.04-clang-18, ubuntu-24.04-clang-18)	1m 17s
build (windows-2022, windows-2022-msvc-1940, windows-2022-msvc-1940)	4m 7s
build-test-downstream (windows-2022, windows-2022-msvc-1940, windows-2022-msvc-1940)	3m 38s
build (macos-15, macos-15-armv8-clang-14, macos-15-armv8-clang-14)	3m 13s
build-test-downstream (macos-26, macos-26-armv8-clang-14, macos-26-armv8-clang-14)	1m 57s
build (ubuntu-24.04, ubuntu-24.04-clang-18, android-35-x86_64, 28.1.13356709)	1m 26s
build (macos-26, macos-26-armv8-clang-14, macos-26-armv8-clang-14)	4m 24s
build (ubuntu-24.04, ubuntu-24.04-gcc-14, ubuntu-24.04-gcc-14)	1m 10s
build-test-downstream (ubuntu-24.04, ubuntu-24.04-clang-18, ubuntu-24.04-clang-18)	2m 38s
build-test-downstream (ubuntu-24.04, ubuntu-24.04-clang-18, android-35-x86_64, 28.1.13356709)	2m 33s
test	0s
docker	0s
	30m 53s

Provide feedback