OCL: cleanup workarounds