Merge pull request #3731 from waldenraines/remove-cruft
Remove code that has been replaced by bastion/v2 APIs.
Merge pull request #3731 from waldenraines/remove-cruft
Remove code that has been replaced by bastion/v2 APIs.