Fixing merge conflicts from Openshift
Fixed duplication of code