first pass-through of option removal for hammer-cli-sam commands