Removed all the temporary frigs to get Openshift to work - this will fail, but I can fix later