clean up after recursive OCAP merge