Cleanup issues discovered during OpenShift deployment