[ChOp] Cleanup