Revert "Add OC and simple gov into msm2"

This reverts commit 50a0119720d91bc38dbd2538e085f71603b4d2da.