Cleanup and more openshift_origin