OCL: cleanup workarounds

For process termination without hungs