Cleanup #4899

Job	Run time
Lint	36s
Golang Unit Tests v1.21.7 (ubuntu-20.04)	3m 6s
e2e tests (\[APM\], ubuntu-latest)	3m 34s
Golang Unit Tests v1.21.7 (macos-13)	6m 37s
e2e tests (\[APM\], macos-13)	13m 33s
e2e tests (\[Error handling\], ubuntu-latest)	3m 50s
e2e tests (\[Error handling\], macos-13)	16m 19s
e2e tests (\[Key\], ubuntu-latest)	4m 7s
e2e tests (\[Key\], macos-13)	12m 40s
e2e tests (\[Network\], ubuntu-latest)	5m 14s
e2e tests (\[Network\], macos-13)	11m 37s
e2e tests (\[Package Management\], ubuntu-latest)	6m 49s
e2e tests (\[Package Management\], macos-13)	20m 34s
e2e tests (\[Root\], ubuntu-latest)	3m 38s
e2e tests (\[Root\], macos-13)	13m 10s
e2e tests (\[Local Subnet\], ubuntu-latest)	12m 20s
e2e tests (\[Local Subnet\], macos-13)	12m 9s
e2e tests (\[Subnet Compatibility\], ubuntu-latest)	5m 8s
e2e tests (\[Subnet Compatibility\], macos-13)	11m 47s
e2e tests (\[Public Subnet\], ubuntu-latest)	8m 50s
e2e tests (\[Subnet\], ubuntu-latest)	3m 54s
e2e tests (\[Subnet\], macos-13)	17m 32s
e2e tests (\[Upgrade expect network failure\], ubuntu-latest)	4m 2s
e2e tests (\[Upgrade expect network failure\], macos-13)	12m 38s
e2e tests (\[Upgrade public network\], ubuntu-latest)	3m 55s
e2e tests (\[Upgrade public network\], macos-13)	10m 58s
e2e tests (\[Upgrade local network\], ubuntu-latest)	10m 31s
e2e tests (\[Upgrade local network\], macos-13)	18m 49s
e2e tests (\[Node create\], ubuntu-latest)	5m 1s
e2e tests (\[Node devnet\], ubuntu-latest)	5m 32s
e2e tests (\[Docker\], ubuntu-latest)	2m 54s
	4h 31m 24s

Provide feedback