Clean up; test run on Openshift