Remove unneeded code
Merge pull request #322 from pmorie/deadcode

Merged by openshift-bot