Remove more openshift stuff