Land #19798, fixing link and code cleanup #985

Job	Run time
build / Compile Java Meterpreter	0s
build / python 3.6 macos-13	3m 33s
build / python 3.11 macos-13	3m 2s
build / java 8 macos-13	3m 55s
build / java 21 macos-13	3m 3s
build / php 5.3 macos-13	4m 46s
build / php 7.4 macos-13	4m 37s
build / php 8.3 macos-13	4m 2s
build / python 3.6 windows-2019	5m 56s
build / python 3.11 windows-2019	6m 2s
build / java 8 windows-2019	9m 10s
build / java 21 windows-2019	4m 24s
build / php 5.3 windows-2019	12m 58s
build / php 7.4 windows-2019	8m 28s
build / php 8.3 windows-2019	4m 52s
build / python 3.6 ubuntu-20.04	1m 59s
build / python 3.11 ubuntu-20.04	1m 50s
build / java 8 ubuntu-20.04	1m 38s
build / java 21 ubuntu-20.04	1m 38s
build / php 5.3 ubuntu-20.04	1m 47s
build / php 7.4 ubuntu-20.04	1m 36s
build / php 8.3 ubuntu-20.04	1m 30s
build / windows_meterpreter windows-2019	5m 54s
build / windows_meterpreter windows-2022	5m 52s
build / mettle macos-13	2m 56s
build / mettle ubuntu-20.04	1m 49s
build / Generate report	31s
	1h 47m 48s

Provide feedback