feat: clean cf code#371

ATGardner wants to merge 7 commits intorelease-2.12codefresh-io/argo-cd:release-2.12from

CR-26325-clean-cf-codecodefresh-io/argo-cd:CR-26325-clean-cf-codeCopy head branch name to clipboard