add cleanup to mcp-oc

Change-Id: I1e267036651138f72985a00ce9dba57b3efce91b
2 files changed