Merge pull request #17353 from spowelljr/removeUnusedShorthands #2721

Job	Run time
build_minikube	16m 58s
lint	6m 3s
unit_test	2m 38s
functional_docker_containerd_ubuntu	7m 21s
functional_virtualbox_macos	36m 36s
functional_docker_ubuntu	8m 37s
functional_baremetal_ubuntu20_04	7m 9s
functional_podman_ubuntu	12m 15s
upload_all_reports	35s
	1h 38m 12s

Provide feedback