removing v1 logic
Merge pull request #2926 from danmcp/master

Merged by openshift-bot