Remove unused code
Merge pull request #5341 from danmcp/master

Merged by openshift-bot