Revert "Trying to make OC optional"

This reverts commit 8d1d84bc0712f1d3ece097539f1282e41e086194.

revert: trying to make OC optional
*It didn't work