Cleanup OpenShift CLI

Reduce number of abstractions, identify gaps in existing client code.