Remove unused teardowns
Merge pull request #4973 from danmcp/master

Merged by openshift-bot