Clean up of ai-helpers#472

stbenjam wants to merge 7 commits into

openshift-eng:mainopenshift-eng/ai-helpers:mainfrom

stbenjam:clean-upstbenjam/ai-helpers:clean-upCopy head branch name to clipboard